Merge pull request #5178 from mhsdesign/task/fix-mini-costmetic-todos

TASK: Fix mini cosmetic Todos

Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/NodeAggregateIds.php

@@ -97,9 +97,6 @@ public function isEmpty(): bool
         return count($this->ids) === 0;
     }
 
-    /**
-     * @return \Traversable<string,NodeAggregateId>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->ids;

Neos.ContentGraph.PostgreSQLAdapter/src/Domain/Projection/NodeRelationAnchorPoints.php

@@ -99,9 +99,6 @@ public function remove(NodeRelationAnchorPoint $nodeRelationAnchorPoint): self
         return new self(...$childNodeAnchors);
     }
 
-    /**
-     * @return \Traversable<NodeRelationAnchorPoint>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->nodeRelationAnchorPoints;

Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionConstraintSet.php

@@ -55,9 +55,6 @@ public static function createEmpty(): self
         return new self([]);
     }
 
-    /**
-     * @return \Traversable<string,ContentDimensionConstraints>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->constraints;

Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValueVariationEdges.php

@@ -37,9 +37,6 @@ public static function createEmpty(): self
         return new self();
     }
 
-    /**
-     * @return \Traversable<ContentDimensionValueVariationEdge>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->edges;

Neos.ContentRepository.Core/Classes/Dimension/ContentDimensionValues.php

@@ -59,9 +59,6 @@ public function __construct(array $values)
         $this->maximumDepth = $maximumDepth;
     }
 
-    /**
-     * @return \Traversable<string,ContentDimensionValue>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->values;

Neos.ContentRepository.Core/Classes/DimensionSpace/DimensionSpacePointSet.php

@@ -148,9 +148,6 @@ public function equals(DimensionSpacePointSet $other): bool
         return $thisPointHashes === $otherPointHashes;
     }
 
-    /**
-     * @return \Traversable<string,DimensionSpacePoint>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->points;

Neos.ContentRepository.Core/Classes/DimensionSpace/OriginDimensionSpacePointSet.php

@@ -128,9 +128,6 @@ public function count(): int
         return count($this->points);
     }
 
-    /**
-     * @return \Traversable<string,OriginDimensionSpacePoint>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->points;

Neos.ContentRepository.Core/Classes/EventStore/Events.php

@@ -36,9 +36,6 @@ public static function fromArray(array $events): self
         return new self(...$events);
     }
 
-    /**
-     * @return \Traversable<EventInterface|DecoratedEvent>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->events;

Neos.ContentRepository.Core/Classes/Feature/Common/InterdimensionalSiblings.php

@@ -92,9 +92,6 @@ public function toDimensionSpacePointSet(): DimensionSpacePointSet
         ));
     }
 
-    /**
-     * @return \Traversable<InterdimensionalSibling>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->items;

Neos.ContentRepository.Core/Classes/Feature/NodeDuplication/Dto/NodeReferencesSnapshot.php

@@ -83,9 +83,6 @@ public static function fromReferences(References $nodeReferences): self
         return new self($values);
     }
 
-    /**
-     * @return \Traversable<string,NodeReferenceSnapshot>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->references;

Neos.ContentRepository.Core/Classes/Feature/NodeModification/Dto/SerializedPropertyValues.php

@@ -146,9 +146,6 @@ public function getProperty(string $propertyName): ?SerializedPropertyValue
         return $this->values[$propertyName] ?? null;
     }
 
-    /**
-     * @return \Traversable<string,SerializedPropertyValue>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->values;

Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Dto/NodeReferencesToWrite.php

@@ -84,9 +84,6 @@ public static function fromJsonString(string $jsonString): self
         }
     }
 
-    /**
-     * @return \Traversable<NodeReferenceToWrite>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->references;

Neos.ContentRepository.Core/Classes/Feature/NodeReferencing/Dto/SerializedNodeReferences.php

@@ -80,9 +80,6 @@ public function merge(self $other): self
         return new self(...array_merge($this->references, $other->references));
     }
 
-    /**
-     * @return \Traversable<SerializedNodeReference>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->references;

Neos.ContentRepository.Core/Classes/Feature/SubtreeTagging/Dto/SubtreeTags.php

@@ -108,7 +108,7 @@ public function toStringArray(): array
 
     public function getIterator(): \Traversable
     {
-        return new \ArrayIterator(array_values($this->tags));
+        yield from array_values($this->tags);
     }
 
     /**

Neos.ContentRepository.Core/Classes/Feature/WorkspacePublication/Dto/NodeIdsToPublishOrDiscard.php

@@ -51,9 +51,6 @@ public function merge(self $other): self
         return new self(array_merge($this->nodeIds, $other->nodeIds));
     }
 
-    /**
-     * @return \Traversable<NodeIdToPublishOrDiscard>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->nodeIds;

Neos.ContentRepository.Core/Classes/Feature/WorkspaceRebase/CommandsThatFailedDuringRebase.php

@@ -44,9 +44,6 @@ public function isEmpty(): bool
         return $this->items === [];
     }
 
-    /**
-     * @return \Traversable<int,CommandThatFailedDuringRebase>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->items;

Neos.ContentRepository.Core/Classes/NodeType/NodeTypeNames.php

@@ -71,9 +71,6 @@ public function withAdditionalNodeTypeName(NodeTypeName $nodeTypeName): self
         return new self(...$nodeTypeNames);
     }
 
-    /**
-     * @return \Traversable<NodeTypeName>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->nodeTypeNames;

Neos.ContentRepository.Core/Classes/Projection/ContentGraph/CoverageByOrigin.php

@@ -68,9 +68,6 @@ public function getCoverage(OriginDimensionSpacePoint $originDimensionSpacePoint
         return $this->coverage[$originDimensionSpacePoint->hash] ?? null;
     }
 
-    /**
-     * @return \Traversable<string,DimensionSpacePointSet>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->coverage;

Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Filter/Ordering/Ordering.php

@@ -57,9 +57,6 @@ public function andByTimestampField(TimestampField $timestampField, OrderingDire
         return new self(...[...$this->fields, OrderingField::byTimestampField($timestampField, $direction)]);
     }
 
-    /**
-     * @return \Traversable<OrderingField>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->fields;

Neos.ContentRepository.Core/Classes/Projection/ContentGraph/NodeAggregates.php

@@ -60,9 +60,6 @@ public static function createEmpty(): self
         return new self([]);
     }
 
-    /**
-     * @return \Traversable<NodeAggregate>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->nodeAggregates;

Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Nodes.php

@@ -69,9 +69,6 @@ public function offsetGet(mixed $offset): ?Node
         return $this->nodes[$offset] ?? null;
     }
 
-    /**
-     * @return \Traversable<Node>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->nodes;

Neos.ContentRepository.Core/Classes/Projection/ContentGraph/OriginByCoverage.php

@@ -76,9 +76,6 @@ public function getOrigin(DimensionSpacePoint $coveredDimensionSpacePoint): ?Ori
         return $this->origins[$coveredDimensionSpacePoint->hash] ?? null;
     }
 
-    /**
-     * @return \Traversable<string,OriginDimensionSpacePoint>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->origins;

Neos.ContentRepository.Core/Classes/Projection/ContentGraph/References.php

@@ -65,9 +65,6 @@ public function getNodes(): Nodes
         ));
     }
 
-    /**
-     * @return \Traversable<int,Reference>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->references;

Neos.ContentRepository.Core/Classes/Projection/ProjectionStatuses.php

@@ -36,6 +36,6 @@ public function with(string $projectionClassName, ProjectionStatus $projectionSt
 
     public function getIterator(): \Traversable
     {
-        return new \ArrayIterator($this->statuses);
+        yield from $this->statuses;
     }
 }

Neos.ContentRepository.Core/Classes/Projection/Projections.php

@@ -7,7 +7,7 @@
 /**
  * An immutable set of Content Repository projections ({@see ProjectionInterface}
  *
- * @implements \IteratorAggregate<ProjectionInterface>
+ * @implements \IteratorAggregate<ProjectionInterface<ProjectionStateInterface>>
  * @internal
  */
 final class Projections implements \IteratorAggregate, \Countable
@@ -95,9 +95,6 @@ public function getClassNames(): array
         return array_keys($this->projections);
     }
 
-    /**
-     * @return \Traversable<ProjectionInterface<ProjectionStateInterface>>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->projections;

Neos.ContentRepository.Core/Classes/SharedModel/Node/NodeAggregateIds.php

@@ -109,9 +109,6 @@ public function toStringArray(): array
         return array_keys($this->nodeAggregateIds);
     }
 
-    /**
-     * @return \Traversable<string,NodeAggregateId>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->nodeAggregateIds;

Neos.ContentRepository.Core/Classes/SharedModel/Node/PropertyNames.php

@@ -8,7 +8,7 @@
  * @implements \IteratorAggregate<int, PropertyName>
  * @api
  */
-final readonly class PropertyNames implements \IteratorAggregate, \JsonSerializable
+final readonly class PropertyNames implements \IteratorAggregate, \Countable, \JsonSerializable
 {
     /**
      * @var array<int, PropertyName>
@@ -51,11 +51,18 @@ public function jsonSerialize(): mixed
         return $this->values;
     }
 
-    /**
-     * @return \Traversable<int, PropertyName>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->values;
     }
+
+    public function isEmpty(): bool
+    {
+        return $this->values === [];
+    }
+
+    public function count(): int
+    {
+        return count($this->values);
+    }
 }

Neos.ContentRepository.Core/Classes/SharedModel/Workspace/ContentStreams.php

@@ -57,9 +57,6 @@ public static function createEmpty(): self
         return new self([]);
     }
 
-    /**
-     * @return \Traversable<ContentStream>
-     */
     public function getIterator(): \Traversable
     {
         yield from array_values($this->contentStreams);

Neos.ContentRepository.Core/Classes/SharedModel/Workspace/Workspaces.php

@@ -97,9 +97,6 @@ public function getDependantWorkspaces(WorkspaceName $workspaceName): Workspaces
         );
     }
 
-    /**
-     * @return \Traversable<Workspace>
-     */
     public function getIterator(): \Traversable
     {
         yield from array_values($this->workspaces);

Neos.ContentRepository.Export/src/Asset/ValueObject/SerializedImageAdjustments.php

@@ -34,9 +34,6 @@ public static function fromArray(array $array): self
         return new self(array_map(static fn(array $adjustment) => SerializedImageAdjustment::fromArray($adjustment), $array));
     }
 
-    /**
-     * @return \Traversable<SerializedImageAdjustment>
-     */
     public function getIterator(): \Traversable
     {
         yield from $this->serializedAdjustments;

Neos.ContentRepository.Export/src/Event/ValueObject/ExportedEvents.php

@@ -46,9 +46,6 @@ public function toJsonl(): string
         return $result;
     }
 
-    /**
-     * @return \Traversable<ExportedEvent>
-     */
     public function getIterator(): \Traversable
     {
         return ($this->generator)();

Neos.ContentRepository.LegacyNodeMigration/Classes/Helpers/NodeDataLoader.php

@@ -15,9 +15,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * @return \Traversable<int, array<string, mixed>>
-     */
     public function getIterator(): \Traversable
     {
         $query = $this->connection->executeQuery('

Neos.ContentRepository.LegacyNodeMigration/Tests/Behavior/Bootstrap/FeatureContext.php

@@ -48,8 +48,6 @@ class FeatureContext implements Context
     use CRTestSuiteTrait;
     use CRBehavioralTestsSubjectProvider;
 
-    protected $isolated = false;
-
     private array $nodeDataRows = [];
     /** @var array<PersistentResource> */
     private array $mockResources = [];
@@ -70,8 +68,6 @@ class FeatureContext implements Context
      */
     private array $loggedWarnings = [];
 
-    private ContentRepository $contentRepository;
-
     protected ContentRepositoryRegistry $contentRepositoryRegistry;
 
     public function __construct()