Merge branch 'MAGETWO-62486' of github.com:magento-troll/magento2ce into Sprint55

Author: slopukhov

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

@@ -8,11 +8,13 @@
 use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\Event\ManagerInterface;
 use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
+use Magento\Framework\Serialize\SerializerInterface;
 use Magento\Framework\View\Layout\Element;
 use Magento\Framework\View\Layout\ScheduledStructure;
 use Magento\Framework\App\State as AppState;
 use Psr\Log\LoggerInterface as Logger;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Layout model
@@ -165,6 +167,11 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      */
     protected $logger;
 
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
     /**
      * @param Layout\ProcessorFactory $processorFactory
      * @param ManagerInterface $eventManager
@@ -179,6 +186,7 @@ class Layout extends \Magento\Framework\Simplexml\Config implements \Magento\Fra
      * @param \Magento\Framework\App\State $appState
      * @param \Psr\Log\LoggerInterface $logger
      * @param bool $cacheable
+     * @param SerializerInterface|null $serializer
      */
     public function __construct(
         Layout\ProcessorFactory $processorFactory,
@@ -193,10 +201,12 @@ public function __construct(
         Layout\Generator\ContextFactory $generatorContextFactory,
         AppState $appState,
         Logger $logger,
-        $cacheable = true
+        $cacheable = true,
+        SerializerInterface $serializer = null
     ) {
         $this->_elementClass = \Magento\Framework\View\Layout\Element::class;
         $this->_renderingOutput = new \Magento\Framework\DataObject();
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
 
         $this->_processorFactory = $processorFactory;
         $this->_eventManager = $eventManager;
@@ -308,12 +318,19 @@ public function generateElements()
         $cacheId = 'structure_' . $this->getUpdate()->getCacheId();
         $result = $this->cache->load($cacheId);
         if ($result) {
-            $this->readerContext = unserialize($result);
+            $data = $this->serializer->unserialize($result);
+            $this->getReaderContext()->getPageConfigStructure()->populateWithArray($data['pageConfigStructure']);
+            $this->getReaderContext()->getScheduledStructure()->populateWithArray($data['scheduledStructure']);
         } else {
             \Magento\Framework\Profiler::start('build_structure');
             $this->readerPool->interpret($this->getReaderContext(), $this->getNode());
             \Magento\Framework\Profiler::stop('build_structure');
-            $this->cache->save(serialize($this->getReaderContext()), $cacheId, $this->getUpdate()->getHandles());
+
+            $data = [
+                'pageConfigStructure' => $this->getReaderContext()->getPageConfigStructure()->__toArray(),
+                'scheduledStructure'  => $this->getReaderContext()->getScheduledStructure()->__toArray(),
+            ];
+            $this->cache->save($this->serializer->serialize($data), $cacheId, $this->getUpdate()->getHandles());
         }
 
         $generatorContext = $this->generatorContextFactory->create(

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

@@ -19,6 +19,23 @@ class ScheduledStructure
     const ELEMENT_IS_AFTER = 'isAfter';
     /**#@-*/
 
+    /**
+     * Map of class properties.
+     *
+     * @var array
+     */
+    private $serializableProperties = [
+        'scheduledStructure',
+        'scheduledData',
+        'scheduledElements',
+        'scheduledMoves',
+        'scheduledRemoves',
+        'scheduledIfconfig',
+        'scheduledPaths',
+        'elementsToSort',
+        'brokenParent',
+    ];
+
     /**
      * Information about structural elements, scheduled for creation
      *
@@ -84,18 +101,10 @@ class ScheduledStructure
 
     /**
      * @param array $data
-     *
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function __construct(array $data = [])
     {
-        $this->scheduledStructure = isset($data['scheduledStructure']) ? $data['scheduledStructure'] : [];
-        $this->scheduledData = isset($data['scheduledData']) ? $data['scheduledData'] : [];
-        $this->scheduledElements = isset($data['scheduledElements']) ? $data['scheduledElements'] : [];
-        $this->scheduledMoves = isset($data['scheduledMoves']) ? $data['scheduledMoves'] : [];
-        $this->scheduledRemoves = isset($data['scheduledRemoves']) ? $data['scheduledRemoves'] : [];
-        $this->scheduledIfconfig = isset($data['scheduledIfconfig']) ? $data['scheduledIfconfig'] : [];
-        $this->scheduledPaths = isset($data['scheduledPaths']) ? $data['scheduledPaths'] : [];
+        $this->populateWithArray($data);
     }
 
     /**
@@ -531,4 +540,44 @@ public function flushScheduledStructure()
         $this->scheduledElements = [];
         $this->scheduledStructure = [];
     }
+
+    /**
+     * Reformat 'Layout scheduled structure' to array.
+     *
+     * @return array
+     */
+    public function __toArray()
+    {
+        $result = [];
+        foreach ($this->serializableProperties as $property) {
+            $result[$property] = $this->{$property};
+        }
+
+        return $result;
+    }
+
+    /**
+     * Update 'Layout scheduled structure' data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function populateWithArray(array $data)
+    {
+        foreach ($this->serializableProperties as $property) {
+            $this->{$property} = $this->getArrayValueByKey($property, $data);
+        }
+    }
+
+    /**
+     * Get value from array by key.
+     *
+     * @param string $key
+     * @param array $array
+     * @return array
+     */
+    private function getArrayValueByKey($key, array $array)
+    {
+        return isset($array[$key]) ? $array[$key] : [];
+    }
 }

lib/internal/Magento/Framework/View/Page/Config/Structure.php

@@ -12,6 +12,22 @@
  */
 class Structure
 {
+    /**
+     * Map of class properties.
+     *
+     * @var array
+     */
+    private $serializableProperties = [
+        'assets',
+        'removeAssets',
+        'title',
+        'metadata',
+        'elementAttributes',
+        'removeElementAttributes',
+        'bodyClasses',
+        'isBodyClassesDeleted',
+    ];
+
     /**
      * Information assets elements on page
      *
@@ -194,4 +210,44 @@ public function getAssets()
     {
         return $this->assets;
     }
+
+    /**
+     * Reformat 'Page config structure' to array.
+     *
+     * @return array
+     */
+    public function __toArray()
+    {
+        $result = [];
+        foreach ($this->serializableProperties as $property) {
+            $result[$property] = $this->{$property};
+        }
+
+        return $result;
+    }
+
+    /**
+     * Update 'Page config structure' data.
+     *
+     * @param array $data
+     * @return void
+     */
+    public function populateWithArray(array $data)
+    {
+        foreach ($this->serializableProperties as $property) {
+            $this->{$property} = $this->getArrayValueByKey($property, $data);
+        }
+    }
+
+    /**
+     * Get value from array by key.
+     *
+     * @param string $key
+     * @param array $array
+     * @return array
+     */
+    private function getArrayValueByKey($key, array $array)
+    {
+        return isset($array[$key]) ? $array[$key] : [];
+    }
 }