Remove BlockContextManager

sonata-project · Aug 8, 2022 · d792fb8 · d792fb8
1 parent a0275d3
commit d792fb8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 128 deletions.
diff --git a/docs/reference/installation.rst b/docs/reference/installation.rst
@@ -138,16 +138,7 @@ SonataAdminBundle Configuration
 SonataBlockBundle Configuration
 -------------------------------
 
-.. code-block:: yaml
-
-    # config/packages/sonata_block.yaml
-
-    sonata_block:
-        context_manager: sonata.page.block.context_manager
-
-.. note::
-
-    Please you need to use the context ``sonata_page_bundle`` in the SonataBlockBundle to add block into a Page.
+You need to use the context ``sonata_page_bundle`` in the SonataBlockBundle to add block into a Page.
 
 Security Configuration
 ----------------------

diff --git a/src/Block/BlockContextManager.php b/src/Block/BlockContextManager.php
diff --git a/src/Resources/config/block.xml b/src/Resources/config/block.xml
@@ -25,9 +25,6 @@
             <argument type="service" id="sonata.block.renderer"/>
             <argument type="service" id="sonata.block.context_manager"/>
         </service>
-        <service id="sonata.page.block.context_manager" class="Sonata\PageBundle\Block\BlockContextManager">
-            <argument type="service" id="sonata.block.context_manager.default"/>
-        </service>
         <service id="sonata.page.block.breadcrumb" class="%sonata.page.block.breadcrumb.class%">
             <tag name="sonata.block"/>
             <tag name="sonata.breadcrumb"/>

diff --git a/src/Twig/Extension/PageExtension.php b/src/Twig/Extension/PageExtension.php
@@ -18,7 +18,6 @@
 use Sonata\PageBundle\Exception\PageNotFoundException;
 use Sonata\PageBundle\Model\PageBlockInterface;
 use Sonata\PageBundle\Model\PageInterface;
-use Sonata\PageBundle\Model\SnapshotPageProxy;
 use Sonata\PageBundle\Site\SiteSelectorInterface;
 use Symfony\Bridge\Twig\Extension\HttpKernelExtension;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -196,27 +195,14 @@ public function renderContainer($name, $page = null, array $options = [])
      */
     public function renderBlock(PageBlockInterface $block, array $options = [])
     {
-        if (false === $block->getEnabled() && !$this->cmsManagerSelector->isEditor() && $this->hideDisabledBlocks) {
+        if (
+            false === $block->getEnabled()
+            && !$this->cmsManagerSelector->isEditor()
+            && $this->hideDisabledBlocks
+        ) {
             return '';
         }
 
-        $page = $block->getPage();
-
-        // defined extra default key for the cache
-        $pageCacheKeys = null !== $page ? [
-            'manager' => $page instanceof SnapshotPageProxy ? 'snapshot' : 'page',
-            'page_id' => $page->getId(),
-        ] : [];
-
-        // build the parameters array
-        $options = array_merge([
-            'use_cache' => $options['use_cache'] ?? true,
-            'extra_cache_keys' => [],
-        ], $pageCacheKeys, $options);
-
-        // make sure the parameters array contains all valid keys
-        $options['extra_cache_keys'] = array_merge($options['extra_cache_keys'], $pageCacheKeys);
-
         return $this->blockHelper->render($block, $options);
     }
 

diff --git a/tests/App/config/sonata.yaml b/tests/App/config/sonata.yaml
@@ -3,7 +3,6 @@ sonata_block:
     blocks:
         sonata.admin.block.admin_list:
             contexts: [admin]
-    context_manager: sonata.page.block.context_manager
     default_contexts: [sonata_page_bundle]
 
 sonata_page:

diff --git a/tests/Block/BlockContextManagerTest.php b/tests/Block/BlockContextManagerTest.php