From bae8a3d3f0e607851ebc032918106e4860f5a4bc Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 24 Sep 2023 22:38:18 +0200
Subject: [PATCH] TASK: Remove `ContentRepositoryRegistryProvider` and use
 "classic" _protected var pattern in trait

Introducing the pattern with the additional `ContentRepositoryRegistryProvider` makes things just more complex and less obvious.
While not perfectly "clean" we instead import in the `NodeTypeWithFallbackProvider` trait the `ContentRepositoryRegistry` via $_contentRepositoryRegistry.
This pattern is already used across the codebase.
---
 .../Privilege/Node/NodePrivilegeContext.php       |  5 +++--
 .../Utility/ContentRepositoryRegistryProvider.php | 15 ---------------
 .../Controller/Backend/ContentController.php      |  5 +++--
 .../Controller/Frontend/NodeController.php        |  5 +++--
 .../Domain/Service/NodeSiteResolvingService.php   |  5 +++--
 .../Classes/Domain/Service/SiteNodeUtility.php    |  5 +++--
 .../ContentRepositoryIntegrationService.php       |  5 +++--
 Neos.Neos/Classes/Fusion/Helper/NodeHelper.php    |  5 +++--
 .../Classes/Routing/Cache/RouteCacheFlusher.php   |  5 +++--
 .../Utility/NodeTypeWithFallbackProvider.php      |  8 +++++---
 Neos.Neos/Classes/View/FusionView.php             |  5 +++--
 .../Backend/DocumentBreadcrumbPathViewHelper.php  |  5 +++--
 .../Classes/ViewHelpers/Link/NodeViewHelper.php   |  5 +++--
 13 files changed, 38 insertions(+), 40 deletions(-)
 delete mode 100644 Neos.ContentRepositoryRegistry/Classes/Utility/ContentRepositoryRegistryProvider.php

diff --git a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeContext.php b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeContext.php
index 1609220ca3d..06c39096c5a 100644
--- a/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeContext.php
+++ b/Neos.ContentRepository.Security/Classes/Authorization/Privilege/Node/NodePrivilegeContext.php
@@ -17,7 +17,6 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindAncestorNodesFilter;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Security\Context as SecurityContext;
 use Neos\Neos\Utility\NodeTypeWithFallbackProvider;
@@ -27,9 +26,11 @@
  */
 class NodePrivilegeContext
 {
-    use ContentRepositoryRegistryProvider;
     use NodeTypeWithFallbackProvider;
 
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
     /**
      * @Flow\Inject
      * @var SecurityContext
diff --git a/Neos.ContentRepositoryRegistry/Classes/Utility/ContentRepositoryRegistryProvider.php b/Neos.ContentRepositoryRegistry/Classes/Utility/ContentRepositoryRegistryProvider.php
deleted file mode 100644
index 432291627ad..00000000000
--- a/Neos.ContentRepositoryRegistry/Classes/Utility/ContentRepositoryRegistryProvider.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace Neos\ContentRepositoryRegistry\Utility;
-
-use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
-use Neos\Flow\Annotations as Flow;
-
-/**
- * Utility trait for providing the content repository registry
- */
-trait ContentRepositoryRegistryProvider
-{
-    #[Flow\Inject]
-    protected ContentRepositoryRegistry $contentRepositoryRegistry;
-}
diff --git a/Neos.Neos/Classes/Controller/Backend/ContentController.php b/Neos.Neos/Classes/Controller/Backend/ContentController.php
index 4b0aa79cc40..14e470bd1b8 100644
--- a/Neos.Neos/Classes/Controller/Backend/ContentController.php
+++ b/Neos.Neos/Classes/Controller/Backend/ContentController.php
@@ -15,7 +15,6 @@
 namespace Neos\Neos\Controller\Backend;
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
 use Neos\Neos\FrontendRouting\NodeAddressFactory;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
@@ -52,9 +51,11 @@
 class ContentController extends ActionController
 {
     use BackendUserTranslationTrait;
-    use ContentRepositoryRegistryProvider;
     use NodeTypeWithFallbackProvider;
 
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
     /**
      * @Flow\Inject
      * @var AssetRepository
diff --git a/Neos.Neos/Classes/Controller/Frontend/NodeController.php b/Neos.Neos/Classes/Controller/Frontend/NodeController.php
index ef68e46d3eb..460ee7f4bdf 100644
--- a/Neos.Neos/Classes/Controller/Frontend/NodeController.php
+++ b/Neos.Neos/Classes/Controller/Frontend/NodeController.php
@@ -24,7 +24,6 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Subtree;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\Controller\ActionController;
 use Neos\Flow\Mvc\Exception\NoMatchingRouteException;
@@ -52,9 +51,11 @@
  */
 class NodeController extends ActionController
 {
-    use ContentRepositoryRegistryProvider;
     use NodeTypeWithFallbackProvider;
 
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
     /**
      * @Flow\Inject
      * @var PrivilegeManagerInterface
diff --git a/Neos.Neos/Classes/Domain/Service/NodeSiteResolvingService.php b/Neos.Neos/Classes/Domain/Service/NodeSiteResolvingService.php
index 2f9e9ddcf27..d01167d0609 100644
--- a/Neos.Neos/Classes/Domain/Service/NodeSiteResolvingService.php
+++ b/Neos.Neos/Classes/Domain/Service/NodeSiteResolvingService.php
@@ -16,7 +16,6 @@
 
 use Neos\ContentRepository\Core\Factory\ContentRepositoryId;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
 use Neos\Neos\FrontendRouting\NodeAddress;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\Flow\Annotations as Flow;
@@ -25,9 +24,11 @@
 #[Flow\Scope('singleton')]
 class NodeSiteResolvingService
 {
-    use ContentRepositoryRegistryProvider;
     use NodeTypeWithFallbackProvider;
 
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
     public function findSiteNodeForNodeAddress(
         NodeAddress $nodeAddress,
         ContentRepositoryId $contentRepositoryId
diff --git a/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php b/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php
index c95e9e90c89..5dc70e1537c 100644
--- a/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php
+++ b/Neos.Neos/Classes/Domain/Service/SiteNodeUtility.php
@@ -20,7 +20,6 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
 use Neos\Flow\Annotations as Flow;
 use Neos\Neos\Domain\Model\Site;
 use Neos\Neos\Domain\Repository\DomainRepository;
@@ -30,9 +29,11 @@
 #[Flow\Scope('singleton')]
 final class SiteNodeUtility
 {
-    use ContentRepositoryRegistryProvider;
     use NodeTypeWithFallbackProvider;
 
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
     public function __construct(
         private readonly DomainRepository $domainRepository,
         private readonly SiteRepository $siteRepository
diff --git a/Neos.Neos/Classes/EventLog/Integrations/ContentRepositoryIntegrationService.php b/Neos.Neos/Classes/EventLog/Integrations/ContentRepositoryIntegrationService.php
index 6df2a383428..49753d8214d 100644
--- a/Neos.Neos/Classes/EventLog/Integrations/ContentRepositoryIntegrationService.php
+++ b/Neos.Neos/Classes/EventLog/Integrations/ContentRepositoryIntegrationService.php
@@ -17,7 +17,6 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\Workspace\Workspace;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
 use Neos\Neos\FrontendRouting\NodeAddressFactory;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Persistence\PersistenceManagerInterface;
@@ -31,9 +30,11 @@
  */
 class ContentRepositoryIntegrationService extends AbstractIntegrationService
 {
-    use ContentRepositoryRegistryProvider;
     use NodeTypeWithFallbackProvider;
 
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
     public const NODE_ADDED = 'Node.Added';
     public const NODE_UPDATED = 'Node.Updated';
     public const NODE_LABEL_CHANGED = 'Node.LabelChanged';
diff --git a/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php b/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php
index 80a8a0a06c8..64792ef050a 100644
--- a/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php
+++ b/Neos.Neos/Classes/Fusion/Helper/NodeHelper.php
@@ -18,7 +18,6 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\CountAncestorNodesFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindAncestorNodesFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
 use Neos\Neos\FrontendRouting\NodeAddressFactory;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
@@ -32,9 +31,11 @@
  */
 class NodeHelper implements ProtectedContextAwareInterface
 {
-    use ContentRepositoryRegistryProvider;
     use NodeTypeWithFallbackProvider;
 
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
     /**
      * Check if the given node is already a collection, find collection by nodePath otherwise, throw exception
      * if no content collection could be found
diff --git a/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php b/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php
index ca242c92999..0e91960e500 100644
--- a/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php
+++ b/Neos.Neos/Classes/Routing/Cache/RouteCacheFlusher.php
@@ -16,7 +16,6 @@
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\Projection\Workspace\Workspace;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\Routing\RouterCachingService;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
@@ -29,9 +28,11 @@
  */
 class RouteCacheFlusher
 {
-    use ContentRepositoryRegistryProvider;
     use NodeTypeWithFallbackProvider;
 
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
     /**
      * @Flow\Inject
      * @var RouterCachingService
diff --git a/Neos.Neos/Classes/Utility/NodeTypeWithFallbackProvider.php b/Neos.Neos/Classes/Utility/NodeTypeWithFallbackProvider.php
index 93d62807282..67057da1226 100644
--- a/Neos.Neos/Classes/Utility/NodeTypeWithFallbackProvider.php
+++ b/Neos.Neos/Classes/Utility/NodeTypeWithFallbackProvider.php
@@ -6,7 +6,8 @@
 
 use Neos\ContentRepository\Core\NodeType\NodeType;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
+use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
+use Neos\Flow\Annotations as Flow;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
 
 /**
@@ -14,11 +15,12 @@
  */
 trait NodeTypeWithFallbackProvider
 {
-    use ContentRepositoryRegistryProvider;
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $_contentRepositoryRegistry;
 
     protected function getNodeType(Node $node): NodeType
     {
-        $nodeTypeManager = $this->contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId)->getNodeTypeManager();
+        $nodeTypeManager = $this->_contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId)->getNodeTypeManager();
 
         return $nodeTypeManager->hasNodeType($node->nodeTypeName)
             ? $nodeTypeManager->getNodeType($node->nodeTypeName)
diff --git a/Neos.Neos/Classes/View/FusionView.php b/Neos.Neos/Classes/View/FusionView.php
index 0183572e541..0596705c97e 100644
--- a/Neos.Neos/Classes/View/FusionView.php
+++ b/Neos.Neos/Classes/View/FusionView.php
@@ -16,7 +16,6 @@
 
 use GuzzleHttp\Psr7\Message;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\View\AbstractView;
 use Neos\Flow\Security\Context;
@@ -40,9 +39,11 @@
 class FusionView extends AbstractView
 {
     use FusionViewI18nTrait;
-    use ContentRepositoryRegistryProvider;
     use NodeTypeWithFallbackProvider;
 
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
     /**
      * @Flow\Inject
      * @var SiteNodeUtility
diff --git a/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php
index 0e07cef55a4..3757f98c837 100644
--- a/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php
+++ b/Neos.Neos/Classes/ViewHelpers/Backend/DocumentBreadcrumbPathViewHelper.php
@@ -15,7 +15,6 @@
 namespace Neos\Neos\ViewHelpers\Backend;
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
 use Neos\Flow\Annotations as Flow;
 use Neos\FluidAdaptor\Core\ViewHelper\AbstractViewHelper;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
@@ -26,9 +25,11 @@
  */
 class DocumentBreadcrumbPathViewHelper extends AbstractViewHelper
 {
-    use ContentRepositoryRegistryProvider;
     use NodeTypeWithFallbackProvider;
 
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
     /**
      * @var boolean
      */
diff --git a/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php b/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php
index f5ab5cfa033..4b80aad2419 100644
--- a/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php
+++ b/Neos.Neos/Classes/ViewHelpers/Link/NodeViewHelper.php
@@ -18,7 +18,6 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodePath;
-use Neos\ContentRepositoryRegistry\Utility\ContentRepositoryRegistryProvider;
 use Neos\Neos\Domain\Service\NodeTypeNameFactory;
 use Neos\Neos\FrontendRouting\NodeAddress;
 use Neos\Neos\FrontendRouting\NodeAddressFactory;
@@ -127,9 +126,11 @@
 class NodeViewHelper extends AbstractTagBasedViewHelper
 {
     use FusionContextTrait;
-    use ContentRepositoryRegistryProvider;
     use NodeTypeWithFallbackProvider;
 
+    #[Flow\Inject]
+    protected ContentRepositoryRegistry $contentRepositoryRegistry;
+
     /**
      * @var string
      */