feat!: Pass NodesSources repository entityClass to parent constructor…

…. Changed NodesSourcesRepository constructor signature.
roadiz · Jul 14, 2024 · aa917f3 · aa917f3
1 parent 018565d
commit aa917f3
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 38 deletions.
diff --git a/lib/EntityGenerator/src/RepositoryGenerator.php b/lib/EntityGenerator/src/RepositoryGenerator.php
@@ -110,9 +110,7 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = ' . $this->options['entity_namespace'] . '\\' . $this->nodeType->getSourceEntityClassName() . '::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, ' . $this->options['entity_namespace'] . '\\' . $this->nodeType->getSourceEntityClassName() . '::class);
     }' . PHP_EOL;
     }
 }
diff --git a/...Generator/tests/Mocks/GeneratedNodesSourcesWithRepository/Repository/NSMockRepository.php b/...Generator/tests/Mocks/GeneratedNodesSourcesWithRepository/Repository/NSMockRepository.php
@@ -31,8 +31,6 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = \RZ\Roadiz\EntityGenerator\Tests\Mocks\GeneratedNodesSourcesWithRepository\NSMock::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, \RZ\Roadiz\EntityGenerator\Tests\Mocks\GeneratedNodesSourcesWithRepository\NSMock::class);
     }
 }
diff --git a/lib/RoadizCoreBundle/src/Repository/NodesSourcesRepository.php b/lib/RoadizCoreBundle/src/Repository/NodesSourcesRepository.php
@@ -45,15 +45,17 @@ class NodesSourcesRepository extends StatusAwareRepository
      * @param EventDispatcherInterface $dispatcher
      * @param Security $security
      * @param NodeSourceSearchHandlerInterface|null $nodeSourceSearchHandler
+     * @param class-string<NodesSources> $entityClass
      */
     public function __construct(
         ManagerRegistry $registry,
         PreviewResolverInterface $previewResolver,
         EventDispatcherInterface $dispatcher,
         Security $security,
-        ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
+        ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler,
+        string $entityClass = NodesSources::class
     ) {
-        parent::__construct($registry, NodesSources::class, $previewResolver, $dispatcher, $security);
+        parent::__construct($registry, $entityClass, $previewResolver, $dispatcher, $security);
         $this->nodeSourceSearchHandler = $nodeSourceSearchHandler;
     }
 

diff --git a/src/GeneratedEntity/Repository/NSArticleContainerRepository.php b/src/GeneratedEntity/Repository/NSArticleContainerRepository.php
@@ -31,8 +31,6 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = \App\GeneratedEntity\NSArticleContainer::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, \App\GeneratedEntity\NSArticleContainer::class);
     }
 }
diff --git a/src/GeneratedEntity/Repository/NSArticleFeedBlockRepository.php b/src/GeneratedEntity/Repository/NSArticleFeedBlockRepository.php
@@ -31,8 +31,6 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = \App\GeneratedEntity\NSArticleFeedBlock::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, \App\GeneratedEntity\NSArticleFeedBlock::class);
     }
 }
diff --git a/src/GeneratedEntity/Repository/NSArticleRepository.php b/src/GeneratedEntity/Repository/NSArticleRepository.php
@@ -31,8 +31,6 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = \App\GeneratedEntity\NSArticle::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, \App\GeneratedEntity\NSArticle::class);
     }
 }
diff --git a/src/GeneratedEntity/Repository/NSBasicBlockRepository.php b/src/GeneratedEntity/Repository/NSBasicBlockRepository.php
@@ -31,8 +31,6 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = \App\GeneratedEntity\NSBasicBlock::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, \App\GeneratedEntity\NSBasicBlock::class);
     }
 }
diff --git a/src/GeneratedEntity/Repository/NSGroupBlockRepository.php b/src/GeneratedEntity/Repository/NSGroupBlockRepository.php
@@ -31,8 +31,6 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = \App\GeneratedEntity\NSGroupBlock::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, \App\GeneratedEntity\NSGroupBlock::class);
     }
 }
diff --git a/src/GeneratedEntity/Repository/NSMenuLinkRepository.php b/src/GeneratedEntity/Repository/NSMenuLinkRepository.php
@@ -31,8 +31,6 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = \App\GeneratedEntity\NSMenuLink::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, \App\GeneratedEntity\NSMenuLink::class);
     }
 }
diff --git a/src/GeneratedEntity/Repository/NSMenuRepository.php b/src/GeneratedEntity/Repository/NSMenuRepository.php
@@ -31,8 +31,6 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = \App\GeneratedEntity\NSMenu::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, \App\GeneratedEntity\NSMenu::class);
     }
 }
diff --git a/src/GeneratedEntity/Repository/NSNeutralRepository.php b/src/GeneratedEntity/Repository/NSNeutralRepository.php
@@ -31,8 +31,6 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = \App\GeneratedEntity\NSNeutral::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, \App\GeneratedEntity\NSNeutral::class);
     }
 }
diff --git a/src/GeneratedEntity/Repository/NSOfferRepository.php b/src/GeneratedEntity/Repository/NSOfferRepository.php
@@ -31,8 +31,6 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = \App\GeneratedEntity\NSOffer::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, \App\GeneratedEntity\NSOffer::class);
     }
 }
diff --git a/src/GeneratedEntity/Repository/NSPageRepository.php b/src/GeneratedEntity/Repository/NSPageRepository.php
@@ -31,8 +31,6 @@ public function __construct(
         Security $security,
         ?NodeSourceSearchHandlerInterface $nodeSourceSearchHandler
     ) {
-        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler);
-
-        $this->_entityName = \App\GeneratedEntity\NSPage::class;
+        parent::__construct($registry, $previewResolver, $dispatcher, $security, $nodeSourceSearchHandler, \App\GeneratedEntity\NSPage::class);
     }
 }