make removeChild and removeBlock as NEXT_MAJOR

sonata-project · Aug 7, 2023 · 5b5f29a · 5b5f29a
1 parent f458a25
commit 5b5f29a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/Model/PageInterface.php b/src/Model/PageInterface.php
@@ -17,6 +17,11 @@
 
 /**
  * @author Thomas Rabaix <[email protected]>
+ *
+ * NEXT_MAJOR: add these methods
+ *
+ * @method removeChild(PageInterface $child)
+ * @method removeBlock(PageBlockInterface $block)
  */
 interface PageInterface extends \Stringable
 {
@@ -113,7 +118,10 @@ public function setChildren(Collection $children): void;
 
     public function addChild(self $child): void;
 
-    public function removeChild(self $child): void;
+    /**
+     * NEXT_MAJOR uncomment this.
+     */
+    // public function removeChild(self $child): void;
 
     /**
      * @return Collection<array-key, PageBlockInterface>
@@ -122,7 +130,10 @@ public function getBlocks(): Collection;
 
     public function addBlock(PageBlockInterface $block): void;
 
-    public function removeBlock(PageBlockInterface $block): void;
+    /**
+     * NEXT_MAJOR uncomment this.
+     */
+    // public function removeBlock(PageBlockInterface $block): void;
 
     public function getContainerByCode(string $code): ?PageBlockInterface;
 

diff --git a/src/Model/SnapshotPageProxy.php b/src/Model/SnapshotPageProxy.php
@@ -258,7 +258,10 @@ public function addChild(PageInterface $child): void
 
     public function removeChild(PageInterface $child): void
     {
-        $this->getPage()->removeChild($child);
+        // NEXT_MAJOR remove check
+        if (method_exists($this->getPage(), 'removeChild')) {
+            $this->getPage()->removeChild($child);
+        }
     }
 
     public function getBlocks(): Collection
@@ -286,7 +289,10 @@ public function addBlock(PageBlockInterface $block): void
 
     public function removeBlock(PageBlockInterface $block): void
     {
-        $this->getPage()->removeBlock($block);
+        // NEXT_MAJOR remove check
+        if (method_exists($this->getPage(), 'removeBlock')) {
+            $this->getPage()->removeBlock($block);
+        }
     }
 
     public function getContainerByCode(string $code): ?PageBlockInterface