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

adrian-martinez-interactiv4 · adrian-martinez-interactiv4 · commit 3f60168240b4 · 2017-09-22T15:18:41.000+02:00
Adapted PageCache and Framework tests
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
@@ -926,7 +926,7 @@ public function getScope()
      */
     public function getCacheId()
     {
-        return $this->generateCacheId(md5(implode('|',
-            array_merge($this->getHandles(), $this->layoutCacheKey->getCacheKeys()))));
+        $layoutCacheKeys = $this->layoutCacheKey->getCacheKeys();
+        return $this->generateCacheId(md5(implode('|', array_merge($this->getHandles(), $layoutCacheKeys))));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -926,7 +926,7 @@ public function getScope()`
`926`	`926`	`*/`
`927`	`927`	`public function getCacheId()`
`928`	`928`	`{`
`929`		`- return $this->generateCacheId(md5(implode('\|',`
`930`		`- array_merge($this->getHandles(), $this->layoutCacheKey->getCacheKeys()))));`
	`929`	`+ $layoutCacheKeys = $this->layoutCacheKey->getCacheKeys();`
	`930`	`+ return $this->generateCacheId(md5(implode('\|', array_merge($this->getHandles(), $layoutCacheKeys))));`
`931`	`931`	`}`
`932`	`932`	`}`