Remove BlockContextManager

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

src/Twig/Extension/PageExtension.php

@@ -197,25 +197,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 '';
         }
 
-        // defined extra default key for the cache
-        $pageCacheKeys = [
-            'manager' => $block->getPage() instanceof SnapshotPageProxy ? 'snapshot' : 'page',
-            'page_id' => $block->getPage()->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);
     }