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

adrian-martinez-interactiv4 · adrian-martinez-interactiv4 · commit efa3edbc87c0 · 2017-09-22T14:35:18.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
@@ -727,7 +727,7 @@ protected function _loadFileLayoutUpdatesXml()
         $updateFiles = array_merge($updateFiles, $this->pageLayoutFileSource->getFiles($theme, '*.xml'));
         $useErrors = libxml_use_internal_errors(true);
         foreach ($updateFiles as $file) {
-            /** @var $fileReader \Magento\Framework\Filesystem\File\Read   */
+            /** @var $fileReader \Magento\Framework\Filesystem\File\Read */
             $fileReader = $this->readFactory->create($file->getFilename(), DriverPool::FILE);
             $fileStr = $fileReader->readAll($file->getName());
             $fileStr = $this->_substitutePlaceholders($fileStr);
@@ -926,6 +926,7 @@ public function getScope()
      */
     public function getCacheId()
     {
-        return $this->generateCacheId(md5(implode('|', array_merge($this->getHandles(), $this->layoutCacheKey->getCacheKeys()))));
+        return $this->generateCacheId(md5(implode('|',
+            array_merge($this->getHandles(), $this->layoutCacheKey->getCacheKeys()))));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -727,7 +727,7 @@ protected function _loadFileLayoutUpdatesXml()`
`727`	`727`	`$updateFiles = array_merge($updateFiles, $this->pageLayoutFileSource->getFiles($theme, '*.xml'));`
`728`	`728`	`$useErrors = libxml_use_internal_errors(true);`
`729`	`729`	`foreach ($updateFiles as $file) {`
`730`		`- /** @var $fileReader \Magento\Framework\Filesystem\File\Read */`
	`730`	`+ /** @var $fileReader \Magento\Framework\Filesystem\File\Read */`
`731`	`731`	`$fileReader = $this->readFactory->create($file->getFilename(), DriverPool::FILE);`
`732`	`732`	`$fileStr = $fileReader->readAll($file->getName());`
`733`	`733`	`$fileStr = $this->_substitutePlaceholders($fileStr);`
`@@ -926,6 +926,7 @@ public function getScope()`
`926`	`926`	`*/`
`927`	`927`	`public function getCacheId()`
`928`	`928`	`{`
`929`		`- return $this->generateCacheId(md5(implode('\|', array_merge($this->getHandles(), $this->layoutCacheKey->getCacheKeys()))));`
	`929`	`+ return $this->generateCacheId(md5(implode('\|',`
	`930`	`+ array_merge($this->getHandles(), $this->layoutCacheKey->getCacheKeys()))));`
`930`	`931`	`}`
`931`	`932`	`}`