Merge branch 'hotfix/v2.1.16'

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [v2.1.16](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.15...v2.1.16) (2023-06-01)
+
+
+### Bug Fixes
+
+* Do not prevent setting parent with not the same class ([3b5996d](https://github.com/roadiz/core-bundle-dev-app/commit/3b5996dc804510bed29b5f20ef542e933f101561))
+* **LeafInterface:** Do not test exact class when setting LeafInterface parent to allow doctrine proxies. ([56ed76d](https://github.com/roadiz/core-bundle-dev-app/commit/56ed76d401fee87813e0cbb86ac92ec130a46752))
+
 ## [v2.1.15](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.14...v2.1.15) (2023-05-24)
 
 

lib/Models/src/Roadiz/Core/AbstractEntities/LeafInterface.php

@@ -36,7 +36,7 @@ public function getParent(): ?LeafInterface;
     public function getParents(): array;
 
     /**
-     * @param static|null $parent
+     * @param LeafInterface|null $parent
      * @return $this
      */
     public function setParent(?LeafInterface $parent = null): static;

lib/Models/src/Roadiz/Core/AbstractEntities/LeafTrait.php

@@ -39,7 +39,7 @@ public function addChild(LeafInterface $child): static
         return $this;
     }
     /**
-     * @param static $child
+     * @param LeafInterface $child
      * @return $this
      */
     public function removeChild(LeafInterface $child): static
@@ -65,26 +65,7 @@ public function getParent(): ?LeafInterface
     }
 
     /**
-     * @param static|null $parent
-     * @return $this
-     */
-    public function setParent(?LeafInterface $parent = null): static
-    {
-        if ($parent === $this) {
-            throw new \InvalidArgumentException('An entity cannot have itself as a parent.');
-        }
-        if (get_class($parent) !== get_class($this)) {
-            throw new \InvalidArgumentException('Parent must be the same class as the current entity.');
-        }
-
-        $this->parent = $parent;
-        $this->parent?->addChild($this);
-
-        return $this;
-    }
-
-    /**
-     * @return static[]
+     * @return LeafInterface[]
      */
     public function getParents(): array
     {

lib/RoadizCoreBundle/config/services.yaml

@@ -22,7 +22,7 @@ services:
         autowire: true      # Automatically injects dependencies in your services.
         autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
         bind:
-            $cmsVersion: '2.1.15'
+            $cmsVersion: '2.1.16'
             $appVersion: '%roadiz_core.app_version%'
             $cmsVersionPrefix: 'main'
             $staticDomain: '%roadiz_core.static_domain_name%'

lib/RoadizCoreBundle/src/Entity/Folder.php

@@ -339,11 +339,27 @@ public function getFullPath(): string
         $path = [];
 
         foreach ($parents as $parent) {
-            $path[] = $parent->getFolderName();
+            if ($parent instanceof FolderInterface) {
+                $path[] = $parent->getFolderName();
+            }
         }
 
         $path[] = $this->getFolderName();
 
         return implode('/', $path);
     }
+
+    public function setParent(?LeafInterface $parent = null): static
+    {
+        if ($parent === $this) {
+            throw new \InvalidArgumentException('An entity cannot have itself as a parent.');
+        }
+        if (null !== $parent && !$parent instanceof Folder) {
+            throw new \InvalidArgumentException('A folder can only have a folder as a parent.');
+        }
+        $this->parent = $parent;
+        $this->parent?->addChild($this);
+
+        return $this;
+    }
 }

lib/RoadizCoreBundle/src/Entity/Node.php

@@ -993,6 +993,20 @@ public function __clone()
         }
     }
 
+    public function setParent(?LeafInterface $parent = null): static
+    {
+        if ($parent === $this) {
+            throw new \InvalidArgumentException('An entity cannot have itself as a parent.');
+        }
+        if (null !== $parent && !($parent instanceof Node)) {
+            throw new \InvalidArgumentException('A node can only have a Node as a parent.');
+        }
+        $this->parent = $parent;
+        $this->parent?->addChild($this);
+
+        return $this;
+    }
+
     /**
      * @return string
      */

lib/RoadizCoreBundle/src/Entity/Tag.php

@@ -231,7 +231,9 @@ public function getFullPath(): string
         $path = [];
 
         foreach ($parents as $parent) {
-            $path[] = $parent->getTagName();
+            if ($parent instanceof Tag) {
+                $path[] = $parent->getTagName();
+            }
         }
 
         $path[] = $this->getTagName();
@@ -446,4 +448,18 @@ public function getDocuments(): array
             $this->getTranslatedTags()->first()->getDocuments() :
             [];
     }
+
+    public function setParent(?LeafInterface $parent = null): static
+    {
+        if ($parent === $this) {
+            throw new \InvalidArgumentException('An entity cannot have itself as a parent.');
+        }
+        if (null !== $parent && !$parent instanceof Tag) {
+            throw new \InvalidArgumentException('A tag can only have a Tag entity as a parent');
+        }
+        $this->parent = $parent;
+        $this->parent?->addChild($this);
+
+        return $this;
+    }
 }