Fix PageCache: async rendering of blocks can corrupt layout cache #8554 #9050

Update additional pagecache layout handle name

Author: adrian-martinez-interactiv4

app/code/Magento/PageCache/Controller/Block.php

@@ -30,7 +30,7 @@ abstract class Block extends \Magento\Framework\App\Action\Action
     /**
      * @var string
      */
-    private $additionalPageCacheHandle = 'additional_page_cache_handle';
+    private $additionalPageCacheHandle = 'mage_pagecache_additional_handle';
 
     /**
      * @param \Magento\Framework\App\Action\Context $context

app/code/Magento/PageCache/Test/Unit/Controller/Block/EsiTest.php

@@ -90,7 +90,7 @@ public function testExecute($blockClass, $shouldSetHeaders)
     {
         $block = 'block';
         $requestHandles = ['handle1', 'handle2'];
-        $additionalPageCacheHandle = 'additional_page_cache_handle';
+        $additionalPageCacheHandle = 'mage_pagecache_additional_handle';
         $pageCacheHandles = array_merge($requestHandles, [$additionalPageCacheHandle]);
         $html = 'some-html';
         $mapData = [['blocks', '', json_encode([$block])], ['handles', '', base64_encode(json_encode($requestHandles))]];

app/code/Magento/PageCache/Test/Unit/Controller/Block/RenderTest.php

@@ -112,7 +112,7 @@ public function testExecute()
     {
         $blocks = ['block1', 'block2'];
         $requestHandles = ['handle1', 'handle2'];
-        $additionalPageCacheHandle = 'additional_page_cache_handle';
+        $additionalPageCacheHandle = 'mage_pagecache_additional_handle';
         $pageCacheHandles = array_merge($requestHandles, [$additionalPageCacheHandle]);
 
         $originalRequest = '{"route":"route","controller":"controller","action":"action","uri":"uri"}';