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

#9050 #9560 Adapted PageCache and Framework tests
magento · Sep 22, 2017 · 516b529 · 516b529
1 parent 2ae9c26
commit 516b529
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Layout/MergeTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Layout/MergeTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\App\State;
 use Magento\Framework\Phrase;
+use Magento\Framework\View\Layout\LayoutCacheKeyInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -66,7 +67,7 @@ class MergeTest extends \PHPUnit\Framework\TestCase
     protected $pageConfig;
 
     /**
-     * @var \Magento\Framework\View\Layout\LayoutCacheKeyInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LayoutCacheKeyInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $layoutCacheKeyMock;
 
@@ -124,7 +125,7 @@ function ($filename) use ($fileDriver) {
             )
         );
 
-        $this->layoutCacheKeyMock = $this->getMockForAbstractClass(\Magento\Framework\View\Layout\LayoutCacheKeyInterface::class);
+        $this->layoutCacheKeyMock = $this->getMockForAbstractClass(LayoutCacheKeyInterface::class);
         $this->layoutCacheKeyMock->expects($this->any())
             ->method('getCacheKeys')
             ->willReturn([]);

diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
@@ -5,6 +5,8 @@
  */
 namespace Magento\Framework\View\Model\Layout;
 
+use Magento\Framework\View\Layout\LayoutCacheKeyInterface;
+
 class MergeTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -19,7 +21,7 @@ class MergeTest extends \PHPUnit\Framework\TestCase
     protected $model;
 
     /**
-     * @var \Magento\Framework\View\Layout\LayoutCacheKeyInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LayoutCacheKeyInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $layoutCacheKeyMock;
 
@@ -67,7 +69,7 @@ protected function setUp()
         $link2->setLayoutUpdateId($layoutUpdate2->getId());
         $link2->save();
 
-        $this->layoutCacheKeyMock = $this->getMockForAbstractClass(\Magento\Framework\View\Layout\LayoutCacheKeyInterface::class);
+        $this->layoutCacheKeyMock = $this->getMockForAbstractClass(LayoutCacheKeyInterface::class);
         $this->layoutCacheKeyMock->expects($this->any())
             ->method('getCacheKeys')
             ->willReturn([]);

diff --git a/lib/internal/Magento/Framework/View/Model/Layout/CacheKey.php b/lib/internal/Magento/Framework/View/Model/Layout/CacheKey.php
@@ -36,7 +36,8 @@ public function addCacheKeys($cacheKeys)
      *
      * @return array
      */
-    public function getCacheKeys() {
+    public function getCacheKeys()
+    {
         return $this->cacheKeys;
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/MergeTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/MergeTest.php
@@ -9,6 +9,7 @@
 use Magento\Framework\Config\Dom\ValidationSchemaException;
 use Magento\Framework\Phrase;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Magento\Framework\View\Layout\LayoutCacheKeyInterface;
 
 class MergeTest extends \PHPUnit\Framework\TestCase
 {
@@ -43,7 +44,7 @@ class MergeTest extends \PHPUnit\Framework\TestCase
     private $appState;
 
     /**
-     * @var \Magento\Framework\View\Layout\LayoutCacheKeyInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LayoutCacheKeyInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $layoutCacheKeyMock;
 
@@ -60,7 +61,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->layoutCacheKeyMock = $this->getMockForAbstractClass(\Magento\Framework\View\Layout\LayoutCacheKeyInterface::class);
+        $this->layoutCacheKeyMock = $this->getMockForAbstractClass(LayoutCacheKeyInterface::class);
         $this->layoutCacheKeyMock->expects($this->any())
             ->method('getCacheKeys')
             ->willReturn([]);