fix: Removed NodeTypeInterface from Node constructor, Removed ThemeRo…

…utesLoader.php BREAKING CHANGE: Node constructor does not accept any argument anymore.
roadiz · Mar 15, 2024 · 0816525 · 0816525
1 parent 4c72de2
commit 0816525
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 93 deletions.
diff --git a/config/packages/monolog.yaml b/config/packages/monolog.yaml
@@ -54,13 +54,9 @@ when@prod:
             nested:
                 type: stream
                 path: php://stderr
-                level: debug
+                level: info
                 formatter: monolog.formatter.json
             console:
                 type: console
                 process_psr_3_messages: false
                 channels: ["!event", "!doctrine"]
-            deprecation:
-                type: stream
-                channels: [deprecation]
-                path: php://stderr
diff --git a/lib/RoadizCompatBundle/config/services.yaml b/lib/RoadizCompatBundle/config/services.yaml
@@ -89,8 +89,6 @@ services:
     roadiz_compat.twig_loader:
         class: Twig\Loader\FilesystemLoader
         tags: ['twig.loader']
-    RZ\Roadiz\CompatBundle\Routing\ThemeRoutesLoader:
-        tags: [ routing.loader ]
 
     #
     # Made routers theme aware

diff --git a/...RoadizCompatBundle/src/DependencyInjection/Compiler/ThemesTranslatorPathsCompilerPass.php b/...RoadizCompatBundle/src/DependencyInjection/Compiler/ThemesTranslatorPathsCompilerPass.php
@@ -21,6 +21,9 @@ public function process(ContainerBuilder $container): void
         }
     }
 
+    /**
+     * @throws \ReflectionException
+     */
     private function registerThemeTranslatorResources(ContainerBuilder $container): void
     {
         /** @var string $projectDir */

diff --git a/lib/RoadizCompatBundle/src/Routing/ThemeRoutesLoader.php b/lib/RoadizCompatBundle/src/Routing/ThemeRoutesLoader.php
diff --git a/lib/RoadizCoreBundle/config/packages/roadiz_core.yaml b/lib/RoadizCoreBundle/config/packages/roadiz_core.yaml
@@ -11,7 +11,6 @@ roadiz_core:
     # Be careful if you are using a reverse-proxy cache, YOU MUST vary on Accept-Language header and normalize it.
     # @see https://varnish-cache.org/docs/6.3/users-guide/increasing-your-hitrate.html#http-vary
     useAcceptLanguageHeader: '%env(bool:APP_USE_ACCEPT_LANGUAGE_HEADER)%'
-    themes: []
     medias:
         unsplash_client_id: '%env(string:APP_UNSPLASH_CLIENT_ID)%'
         soundcloud_client_id: '%env(string:APP_SOUNDCLOUD_CLIENT_ID)%'

diff --git a/lib/RoadizCoreBundle/config/routing.yaml b/lib/RoadizCoreBundle/config/routing.yaml
@@ -33,10 +33,6 @@ healthCheckAction:
     stateless: true
     controller: RZ\Roadiz\CoreBundle\Controller\HealthCheckController
 
-roadiz_core_themes:
-    resource: .
-    type: themes
-
 api_login_check:
     methods: [POST]
     stateless: true

diff --git a/lib/RoadizCoreBundle/src/Entity/Node.php b/lib/RoadizCoreBundle/src/Entity/Node.php
@@ -318,7 +318,7 @@ class Node extends AbstractDateTimedPositioned implements LeafInterface, Attribu
     /**
      * Create a new empty Node according to given node-type.
      */
-    public function __construct(NodeTypeInterface $nodeType = null)
+    public function __construct()
     {
         $this->nodesTags = new ArrayCollection();
         $this->children = new ArrayCollection();
@@ -328,8 +328,6 @@ public function __construct(NodeTypeInterface $nodeType = null)
         $this->aNodes = new ArrayCollection();
         $this->bNodes = new ArrayCollection();
         $this->attributeValues = new ArrayCollection();
-
-        $this->setNodeType($nodeType);
         $this->initAbstractDateTimed();
     }
 

diff --git a/lib/RoadizCoreBundle/src/Node/NodeFactory.php b/lib/RoadizCoreBundle/src/Node/NodeFactory.php
@@ -43,7 +43,8 @@ public function create(
         }
 
         if ($node === null) {
-            $node = new Node($type);
+            $node = new Node();
+            $node->setNodeType($type);
         }
 
         if ($type instanceof NodeType) {

diff --git a/lib/RoadizCoreBundle/src/Node/NodeTranstyper.php b/lib/RoadizCoreBundle/src/Node/NodeTranstyper.php
@@ -257,6 +257,7 @@ protected function mockTranstype(NodeTypeInterface $nodeType): void
          * transtype, not to get an orphan node.
          */
         $node = new Node();
+        $node->setNodeType($nodeType);
         $node->setNodeName('testing_before_transtype' . $uniqueId);
         $this->getManager()->persist($node);
 

diff --git a/lib/RoadizCoreBundle/src/Node/UniqueNodeGenerator.php b/lib/RoadizCoreBundle/src/Node/UniqueNodeGenerator.php
@@ -49,7 +49,8 @@ public function generate(
         bool $pushToTop = false
     ): NodesSources {
         $name = $nodeType->getDisplayName() . " " . uniqid();
-        $node = new Node($nodeType);
+        $node = new Node();
+        $node->setNodeType($nodeType);
         $node->setTtl($nodeType->getDefaultTtl());
 
         if (null !== $tag) {

diff --git a/lib/Rozier/src/Controllers/Nodes/NodesController.php b/lib/Rozier/src/Controllers/Nodes/NodesController.php
@@ -326,7 +326,9 @@ public function addAction(Request $request, int $nodeTypeId, ?int $translationId
             throw new ResourceNotFoundException(sprintf('Translation #%s does not exist.', $translationId));
         }
 
-        $node = new Node($type);
+        $node = new Node();
+        $node->setNodeType($type);
+
         $chroot = $this->nodeChrootResolver->getChroot($this->getUser());
         if (null !== $chroot) {
             // If user is jailed in a node, prevent moving nodes out.
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,9 @@ public function process(ContainerBuilder $container): void @@
             }
         }
+        /**
+         * @throws \ReflectionException
+         */
         private function registerThemeTranslatorResources(ContainerBuilder $container): void
         {
             /** @var string $projectDir */
@@ Expand Down @@