Merge branch 'MC-37417' of https://github.com/magento-mpi/magento2ce into PR-09-24-2020

Author: chittima

lib/internal/Magento/Framework/View/Layout.php

@@ -35,6 +35,11 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      */
     const LAYOUT_NODE = '<layout/>';
 
+    /**
+     * Default cache life time
+     */
+    private const DEFAULT_CACHE_LIFETIME = 31536000;
+
     /**
      * Layout Update module
      *
@@ -172,6 +177,10 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * @var SerializerInterface
      */
     private $serializer;
+    /**
+     * @var int
+     */
+    private $cacheLifetime;
 
     /**
      * @param Layout\ProcessorFactory $processorFactory
@@ -188,6 +197,7 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * @param \Psr\Log\LoggerInterface $logger
      * @param bool $cacheable
      * @param SerializerInterface|null $serializer
+     * @param int|null $cacheLifetime
      */
     public function __construct(
         Layout\ProcessorFactory $processorFactory,
@@ -203,7 +213,8 @@ public function __construct(
         AppState $appState,
         Logger $logger,
         $cacheable = true,
-        SerializerInterface $serializer = null
+        SerializerInterface $serializer = null,
+        ?int $cacheLifetime = null
     ) {
         $this->_elementClass = \Magento\Framework\View\Layout\Element::class;
         $this->_renderingOutput = new \Magento\Framework\DataObject();
@@ -222,6 +233,7 @@ public function __construct(
         $this->generatorContextFactory = $generatorContextFactory;
         $this->appState = $appState;
         $this->logger = $logger;
+        $this->cacheLifetime = $cacheLifetime ?? self::DEFAULT_CACHE_LIFETIME;
     }
 
     /**
@@ -338,7 +350,8 @@ public function generateElements()
                 'pageConfigStructure' => $this->getReaderContext()->getPageConfigStructure()->__toArray(),
                 'scheduledStructure'  => $this->getReaderContext()->getScheduledStructure()->__toArray(),
             ];
-            $this->cache->save($this->serializer->serialize($data), $cacheId, $this->getUpdate()->getHandles());
+            $handles = $this->getUpdate()->getHandles();
+            $this->cache->save($this->serializer->serialize($data), $cacheId, $handles, $this->cacheLifetime);
         }
 
         $generatorContext = $this->generatorContextFactory->create(

lib/internal/Magento/Framework/View/Model/Layout/Merge.php

@@ -47,6 +47,11 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      */
     const PAGE_LAYOUT_CACHE_SUFFIX = 'page_layout_merged';
 
+    /**
+     * Default cache life time
+     */
+    private const DEFAULT_CACHE_LIFETIME = 31536000;
+
     /**
      * @var \Magento\Framework\View\Design\ThemeInterface
      */
@@ -169,6 +174,10 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * @var ReadFactory
      */
     private $readFactory;
+    /**
+     * @var int
+     */
+    private $cacheLifetime;
 
     /**
      * Init merge model
@@ -182,10 +191,11 @@ class Merge implements \Magento\Framework\View\Layout\ProcessorInterface
      * @param \Magento\Framework\View\Model\Layout\Update\Validator $validator
      * @param \Psr\Log\LoggerInterface $logger
      * @param ReadFactory $readFactory
-     * @param \Magento\Framework\View\Design\ThemeInterface $theme Non-injectable theme instance
+     * @param \Magento\Framework\View\Design\ThemeInterface|null $theme Non-injectable theme instance
      * @param string $cacheSuffix
-     * @param LayoutCacheKeyInterface $layoutCacheKey
+     * @param LayoutCacheKeyInterface|null $layoutCacheKey
      * @param SerializerInterface|null $serializer
+     * @param int|null $cacheLifetime
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -201,7 +211,8 @@ public function __construct(
         \Magento\Framework\View\Design\ThemeInterface $theme = null,
         $cacheSuffix = '',
         LayoutCacheKeyInterface $layoutCacheKey = null,
-        SerializerInterface $serializer = null
+        SerializerInterface $serializer = null,
+        ?int $cacheLifetime = null
     ) {
         $this->theme = $theme ?: $design->getDesignTheme();
         $this->scope = $scopeResolver->getScope();
@@ -216,6 +227,7 @@ public function __construct(
         $this->layoutCacheKey = $layoutCacheKey
             ?: \Magento\Framework\App\ObjectManager::getInstance()->get(LayoutCacheKeyInterface::class);
         $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
+        $this->cacheLifetime = $cacheLifetime ?? self::DEFAULT_CACHE_LIFETIME;
     }
 
     /**
@@ -749,7 +761,7 @@ protected function _loadCache($cacheId)
      */
     protected function _saveCache($data, $cacheId, array $cacheTags = [])
     {
-        $this->cache->save($data, $cacheId, $cacheTags, null);
+        $this->cache->save($data, $cacheId, $cacheTags, $this->cacheLifetime);
     }
 
     /**

lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php

@@ -944,7 +944,7 @@ public function testGenerateElementsWithoutCache(): void
 
         $this->cacheMock->expects($this->once())
             ->method('save')
-            ->with(json_encode($data), 'structure_' . $layoutCacheId, $handles)
+            ->with(json_encode($data), 'structure_' . $layoutCacheId, $handles, 31536000)
             ->willReturn(true);
 
         $generatorContextMock = $this->getMockBuilder(Context::class)

lib/internal/Magento/Framework/View/Test/Unit/Model/Layout/MergeTest.php

@@ -14,6 +14,7 @@
 use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Url\ScopeInterface;
+use Magento\Framework\View\Design\ThemeInterface;
 use Magento\Framework\View\Layout\LayoutCacheKeyInterface;
 use Magento\Framework\View\Model\Layout\Merge;
 use Magento\Framework\View\Model\Layout\Update\Validator;
@@ -67,6 +68,10 @@ class MergeTest extends TestCase
      * @var LayoutCacheKeyInterface|MockObject
      */
     protected $layoutCacheKeyMock;
+    /**
+     * @var ThemeInterface|MockObject
+     */
+    private $theme;
 
     protected function setUp(): void
     {
@@ -88,6 +93,8 @@ protected function setUp(): void
             ->method('getCacheKeys')
             ->willReturn([]);
 
+        $this->theme = $this->createMock(ThemeInterface::class);
+
         $this->model = $this->objectManagerHelper->getObject(
             Merge::class,
             [
@@ -98,6 +105,7 @@ protected function setUp(): void
                 'appState' => $this->appState,
                 'layoutCacheKey' => $this->layoutCacheKeyMock,
                 'serializer' => $this->serializer,
+                'theme' => $this->theme,
             ]
         );
     }
@@ -133,7 +141,12 @@ public function testValidateMergedLayoutThrowsException()
     public function testSaveToCache()
     {
         $this->scope->expects($this->once())->method('getId')->willReturn(1);
-        $this->cache->expects($this->once())->method('save');
+        $this->theme->method('getArea')->willReturn('frontend');
+        $this->theme->method('getId')->willReturn(1);
+        $cacheKey = 'LAYOUT_frontend_STORE1_1d41d8cd98f00b204e9800998ecf8427e_page_layout_merged';
+        $this->cache->expects($this->once())
+            ->method('save')
+            ->with(null, $cacheKey, [], 31536000);
 
         $this->model->load();
     }