Merge pull request #49 from neos/task/adjust-to-moveContentRepository…

…Id-to-correct-namespace

TASK: Adjust to movement of `ContentRepositoryId` to `SharedModel` namespace

config/set/contentrepository-90.php

@@ -402,12 +402,12 @@
         \Neos\ContentRepository\Core\Dimension\ContentDimensionId::class => 'value',
         \Neos\ContentRepository\Core\Dimension\ContentDimensionValue::class => 'value',
         \Neos\ContentRepository\Core\Dimension\ContentDimensionValueSpecializationDepth::class => 'value',
-        \Neos\ContentRepository\Core\Factory\ContentRepositoryId::class => 'value',
         \Neos\ContentRepository\Core\Feature\ContentStreamEventStreamName::class => 'value',
         \Neos\ContentRepository\Core\Infrastructure\Property\PropertyType::class => 'value',
         \Neos\ContentRepository\Core\NodeType\NodeType::class => 'name',
         \Neos\ContentRepository\Core\NodeType\NodeTypeName::class => 'value',
         \Neos\ContentRepository\Core\Projection\ContentGraph\NodePath::class => 'value',
+        \Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::class => 'value',
         \Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId::class => 'value',
         \Neos\ContentRepository\Core\SharedModel\Node\NodeName::class => 'value',
         \Neos\ContentRepository\Core\SharedModel\Node\PropertyName::class => 'value',

docs/rules_overview.md

@@ -21,7 +21,7 @@
      public function run()
      {
 -        $combinations = $this->contentDimensionCombinator->getAllAllowedCombinations();
-+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
++        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
 +        $dimensionSpacePoints = $contentRepository->getVariationGraph()->getDimensionSpacePoints();
 +        // TODO 9.0 migration: try to directly work with $dimensionSpacePoints, instead of converting them to the legacy dimension format
 +
@@ -112,7 +112,7 @@
      {
 -        return $context->getRootNode();
 +        // TODO 9.0 migration: !! MEGA DIRTY CODE! Ensure to rewrite this; by getting rid of LegacyContextStub.
-+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
++        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
 +        $workspace = $contentRepository->getWorkspaceFinder()->findOneByName(\Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName::fromString($context->workspaceName ?? 'live'));
 +        $rootNodeAggregate = $contentRepository->getContentGraph()->findRootNodeAggregateByType($workspace->currentContentStreamId, \Neos\ContentRepository\Core\NodeType\NodeTypeName::fromString('Neos.Neos:Sites'));
 +        $subgraph = $contentRepository->getContentGraph()->getSubgraph($workspace->currentContentStreamId, \Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint::fromLegacyDimensionArray($context->dimensions ?? []), $context->invisibleContentShown ? \Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints::withoutRestrictions() : \Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints::frontend());
@@ -1001,7 +1001,7 @@ return static function (RectorConfig $rectorConfig): void {
      {
 -        $nt = $this->nodeTypeManager->getNodeTypes(false);
 +        // TODO 9.0 migration: Make this code aware of multiple Content Repositories.
-+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
++        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
 +        $nt = $contentRepository->getNodeTypeManager()->getNodeTypes(false);
      }
  }
@@ -1160,7 +1160,7 @@ return static function (RectorConfig $rectorConfig): void {
      public function run(string $workspace)
      {
 -        return $this->workspaceRepository->countByName($workspace);
-+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
++        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
 +        // TODO 9.0 migration: remove ternary operator (...? 1 : 0 ) - unnecessary complexity
 +
 +        return $contentRepository->getWorkspaceFinder()->findOneByName(\Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName::fromString($workspace)) !== null ? 1 : 0;

src/ContentRepository90/Rules/Traits/ValueObjectTrait.php

@@ -4,8 +4,8 @@
 namespace Neos\Rector\ContentRepository90\Rules\Traits;
 
 use Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint;
-use Neos\ContentRepository\Core\Factory\ContentRepositoryId;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
+use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Scalar\String_;

tests/ContentRepository90/Rules/ContentDimensionCombinatorGetAllAllowedCombinationsRector/Fixture/some_class.php.inc

@@ -32,7 +32,7 @@ class SomeClass
     protected $contentDimensionCombinator;
     public function run()
     {
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         $dimensionSpacePoints = $contentRepository->getVariationGraph()->getDimensionSpacePoints();
         // TODO 9.0 migration: try to directly work with $dimensionSpacePoints, instead of converting them to the legacy dimension format
 

tests/ContentRepository90/Rules/NodeTypeAllowsGrandchildNodeType/Fixture/some_class.php.inc

@@ -32,7 +32,7 @@ class SomeClass
         $nodeType = $node->getNodeType();
         $grandParentsNodeType = $node->getParent()->getParent()->getNodeType();
         // TODO 9.0 migration: Make this code aware of multiple Content Repositories.
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
 
         $contentRepository->getNodeTypeManager()->isNodeTypeAllowedAsChildToTetheredNode($grandParentsNodeType, \Neos\ContentRepository\Core\SharedModel\Node\NodeName::fromString($parentNodeName), $nodeType);
     }

tests/ContentRepository90/Rules/NodeTypeGetAutoCreatedChildNodes/Fixture/some_class.php.inc

@@ -25,7 +25,7 @@ class SomeClass
     {
         $nodeType = $node->getNodeType();
         // TODO 9.0 migration: Make this code aware of multiple Content Repositories.
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         $childNodes = $contentRepository->getNodeTypeManager()->getTetheredNodesConfigurationForNodeType($nodeType);
     }
 }

tests/ContentRepository90/Rules/NodeTypeGetAutoCreatedChildNodes/Fixture/some_class2.php.inc

@@ -23,7 +23,7 @@ class SomeClass
     public function run(NodeLegacyStub $node)
     {
         // TODO 9.0 migration: Make this code aware of multiple Content Repositories.
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         $contentRepository->getNodeTypeManager()->getTetheredNodesConfigurationForNodeType($node->getNodeType());
     }
 }

tests/ContentRepository90/Rules/NodeTypeGetAutoCreatedChildNodes/Fixture/some_class3.php.inc

@@ -25,7 +25,7 @@ class SomeClass
     {
         $parent = $node->getParent();
         // TODO 9.0 migration: Make this code aware of multiple Content Repositories.
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         $contentRepository->getNodeTypeManager()->getTetheredNodesConfigurationForNodeType($parent->getNodeType());
     }
 }

tests/ContentRepository90/Rules/NodeTypeGetAutoCreatedChildNodes/Fixture/some_class4.php.inc

@@ -23,7 +23,7 @@ class SomeClass
     public function run(NodeLegacyStub $node)
     {
         // TODO 9.0 migration: Make this code aware of multiple Content Repositories.
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         $contentRepository->getNodeTypeManager()->getTetheredNodesConfigurationForNodeType($node->getParent()->getNodeType());
     }
 }

tests/ContentRepository90/Rules/NodeTypeGetAutoCreatedChildNodes/Fixture/some_class5.php.inc

@@ -26,7 +26,7 @@ class SomeClass
     {
         $nodeType = $node->getNodeType();
         // TODO 9.0 migration: Make this code aware of multiple Content Repositories.
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         foreach ($contentRepository->getNodeTypeManager()->getTetheredNodesConfigurationForNodeType($nodeType) as $key => $_x) {
         }
     }

tests/ContentRepository90/Rules/NodeTypeGetTypeOfAutoCreatedChildNode/Fixture/some_class.php.inc

@@ -29,7 +29,7 @@ class SomeClass
         $nodeName = NodeName::fromString('name');
         $nodeType = $node->getNodeType();
         // TODO 9.0 migration: Make this code aware of multiple Content Repositories.
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         $type = $contentRepository->getNodeTypeManager()->getTypeOfTetheredNode($nodeType, $nodeName);
     }
 }

tests/ContentRepository90/Rules/NodeTypeGetTypeOfAutoCreatedChildNode/Fixture/some_class2.php.inc

@@ -27,7 +27,7 @@ class SomeClass
     {
         $nodeName = NodeName::fromString('name');
         // TODO 9.0 migration: Make this code aware of multiple Content Repositories.
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         $contentRepository->getNodeTypeManager()->getTypeOfTetheredNode($node->getNodeType(), $nodeName);
     }
 }

tests/ContentRepository90/Rules/NodeTypeGetTypeOfAutoCreatedChildNode/Fixture/some_class3.php.inc

@@ -29,7 +29,7 @@ class SomeClass
         $nodeName = NodeName::fromString('name');
         $parent = $node->getParent();
         // TODO 9.0 migration: Make this code aware of multiple Content Repositories.
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         $contentRepository->getNodeTypeManager()->getTypeOfTetheredNode($parent->getNodeType(), $nodeName);
     }
 }

tests/ContentRepository90/Rules/NodeTypeManagerAccessRector/Fixture/some_class.php.inc

@@ -27,7 +27,7 @@ class SomeClass
     public function run()
     {
         // TODO 9.0 migration: Make this code aware of multiple Content Repositories.
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         $nt = $contentRepository->getNodeTypeManager()->getNodeTypes(false);
     }
 }

tests/ContentRepository90/Rules/WorkspaceRepositoryCountByNameRector/Fixture/some_class.php.inc

@@ -29,7 +29,7 @@ class SomeClass
     protected \Neos\ContentRepositoryRegistry\ContentRepositoryRegistry $contentRepositoryRegistry;
     public function run(string $workspace)
     {
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         // TODO 9.0 migration: remove ternary operator (...? 1 : 0 ) - unnecessary complexity
 
         return $contentRepository->getWorkspaceFinder()->findOneByName(\Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName::fromString($workspace)) !== null ? 1 : 0;

tests/Rules/ContextGetRootNodeRector/Fixture/some_class.php.inc

@@ -21,7 +21,7 @@ class SomeClass
     public function run(\Neos\Rector\ContentRepository90\Legacy\LegacyContextStub $context)
     {
         // TODO 9.0 migration: !! MEGA DIRTY CODE! Ensure to rewrite this; by getting rid of LegacyContextStub.
-        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\Factory\ContentRepositoryId::fromString('default'));
+        $contentRepository = $this->contentRepositoryRegistry->get(\Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId::fromString('default'));
         $workspace = $contentRepository->getWorkspaceFinder()->findOneByName(\Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName::fromString($context->workspaceName ?? 'live'));
         $rootNodeAggregate = $contentRepository->getContentGraph()->findRootNodeAggregateByType($workspace->currentContentStreamId, \Neos\ContentRepository\Core\NodeType\NodeTypeName::fromString('Neos.Neos:Sites'));
         $subgraph = $contentRepository->getContentGraph()->getSubgraph($workspace->currentContentStreamId, \Neos\ContentRepository\Core\DimensionSpace\DimensionSpacePoint::fromLegacyDimensionArray($context->dimensions ?? []), $context->invisibleContentShown ? \Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints::withoutRestrictions() : \Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints::frontend());