Remove Block context manager

UPGRADE-4.0.md

@@ -12,3 +12,14 @@ All the deprecated code introduced on 3.x is removed on 4.0.
 Please read [3.x](https://github.com/sonata-project/SonataPageBundle/tree/3.x) upgrade guides for more information.
 
 See also the [diff code](https://github.com/sonata-project/SonataPageBundle/compare/3.x...4.0.0).
+
+## BlockContextManager
+
+The class `Sonata\PageBundle\Block\BlockContextManager` was removed.
+
+Please be aware the config
+```
+sonata_block:
+        context_manager: sonata.page.block.context_manager
+```
+won't work anymore then. You should rely on the default value instead.

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
 ----------------------

src/Resources/config/block.php

@@ -12,7 +12,6 @@
  */
 
 use Sonata\BlockBundle\Block\BlockServiceManagerInterface;
-use Sonata\PageBundle\Block\BlockContextManager;
 use Sonata\PageBundle\Block\BreadcrumbBlockService;
 use Sonata\PageBundle\Block\ChildrenPagesBlockService;
 use Sonata\PageBundle\Block\ContainerBlockService;
@@ -48,11 +47,6 @@
                 new ReferenceConfigurator('sonata.block.context_manager'),
             ])
 
-        ->set('sonata.page.block.context_manager', BlockContextManager::class)
-            ->args([
-                new ReferenceConfigurator('sonata.block.context_manager.default'),
-            ])
-
         ->set('sonata.page.block.breadcrumb', BreadcrumbBlockService::class)
             ->tag('sonata.block')
             ->tag('sonata.breadcrumb')

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;
@@ -184,27 +183,14 @@ public function renderContainer(string $name, $page = null, array $options = [])
      */
     public function renderBlock(PageBlockInterface $block, array $options = []): string
     {
-        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);
     }
 

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: