Fix build

sonata-project · Jul 22, 2022 · 46f63ff · 46f63ff
1 parent 266b270
commit 46f63ff
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 17 deletions.
diff --git a/composer.json b/composer.json
@@ -26,7 +26,7 @@
         "doctrine/doctrine-bundle": "^2.5",
         "doctrine/persistence": "^2.1",
         "sonata-project/admin-bundle": "^3.99",
-        "sonata-project/block-bundle": "^4.0",
+        "sonata-project/block-bundle": "^4.11",
         "sonata-project/doctrine-extensions": "^1.8",
         "sonata-project/doctrine-orm-admin-bundle": "^3.19",
         "sonata-project/form-extensions": "^1.4",

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,5 +1,4 @@
 includes:
-    - phpstan-baseline.neon
     - vendor/phpstan/phpstan/conf/bleedingEdge.neon
 
 parameters:

diff --git a/src/Entity/BaseBlock.php b/src/Entity/BaseBlock.php
@@ -14,9 +14,7 @@
 namespace Sonata\PageBundle\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Sonata\PageBundle\Model\Block;
-use Sonata\PageBundle\Model\PageBlockInterface;
 
 /**
  * The class stores block information.
@@ -30,11 +28,6 @@ abstract class BaseBlock extends Block
      */
     protected $id;
 
-    /**
-     * @var Collection<array-key, PageBlockInterface>
-     */
-    protected $children;
-
     public function __construct()
     {
         $this->children = new ArrayCollection();

diff --git a/src/Resources/config/block.xml b/src/Resources/config/block.xml
@@ -18,6 +18,7 @@
             <argument type="service" id="twig"/>
             <argument type="service" id="sonata.page.site.selector"/>
             <argument type="service" id="sonata.page.cms_manager_selector"/>
+            <argument type="service" id="sonata.page.admin.page"/>
         </service>
         <service id="sonata.page.block.ajax" class="%sonata.page.block.ajax.class%">
             <argument type="service" id="sonata.page.cms_manager_selector"/>

diff --git a/tests/App/Entity/SonataPageBlock.php b/tests/App/Entity/SonataPageBlock.php
@@ -15,8 +15,8 @@
 
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Sonata\BlockBundle\Model\BlockInterface;
 use Sonata\PageBundle\Entity\BaseBlock;
-use Sonata\PageBundle\Model\PageBlockInterface;
 
 /**
  * @ORM\Entity
@@ -41,7 +41,7 @@ class SonataPageBlock extends BaseBlock
      * )
      * @ORM\OrderBy({"position"="ASC"})
      *
-     * @var Collection<array-key, PageBlockInterface>
+     * @var Collection<array-key, BlockInterface>
      */
     protected $children;
 

diff --git a/tests/App/config/sonata.yaml b/tests/App/config/sonata.yaml
@@ -1,4 +1,5 @@
 sonata_block:
+    http_cache: false
     blocks:
         sonata.admin.block.admin_list:
             contexts: [admin]