MAGETWO-62486: Refactor Layout to store data from object only and restore object

- fixed bamboo static builds

Author: vgoncharenko

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 $propertyMap = [
+        '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);
     }
 
     /**
@@ -540,17 +549,12 @@ public function flushScheduledStructure()
      */
     public function __toArray()
     {
-        return [
-            'scheduledStructure' => $this->scheduledStructure,
-            'scheduledData'      => $this->scheduledData,
-            'scheduledElements'  => $this->scheduledElements,
-            'scheduledMoves'     => $this->scheduledMoves,
-            'scheduledRemoves'   => $this->scheduledRemoves,
-            'scheduledIfconfig'  => $this->scheduledIfconfig,
-            'scheduledPaths'     => $this->scheduledPaths,
-            'elementsToSort'     => $this->elementsToSort,
-            'brokenParent'       => $this->brokenParent,
-        ];
+        $result = [];
+        foreach ($this->propertyMap as $property) {
+            $result[$property] = $this->{$property};
+        }
+
+        return $result;
     }
 
     /**
@@ -559,19 +563,22 @@ public function __toArray()
      *
      * @param array $data
      * @return void
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function populateWithArray(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->elementsToSort = isset($data['elementsToSort']) ? $data['elementsToSort'] : [];
-        $this->brokenParent = isset($data['brokenParent']) ? $data['brokenParent'] : [];
+        foreach ($this->propertyMap as $property) {
+            $this->{$property} = $this->getDataValue($property, $data);
+        }
+    }
+
+    /**
+     * Get value from array by key.
+     *
+     * @param string $name
+     * @param array $data
+     * @return array
+     */
+    private function getDataValue($name, array $data) {
+        return isset($data[$name]) ? $data[$name] : [];
     }
 }

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

@@ -12,6 +12,22 @@
  */
 class Structure
 {
+    /**
+     * Map of class properties.
+     *
+     * @var array
+     */
+    private $propertyMap = [
+        'assets',
+        'removeAssets',
+        'title',
+        'metadata',
+        'elementAttributes',
+        'removeElementAttributes',
+        'bodyClasses',
+        'isBodyClassesDeleted',
+    ];
+
     /**
      * Information assets elements on page
      *
@@ -203,16 +219,12 @@ public function getAssets()
      */
     public function __toArray()
     {
-        return [
-            'assets'                  => $this->assets,
-            'removeAssets'            => $this->removeAssets,
-            'title'                   => $this->title,
-            'metadata'                => $this->metadata,
-            'elementAttributes'       => $this->elementAttributes,
-            'removeElementAttributes' => $this->removeElementAttributes,
-            'bodyClasses'             => $this->bodyClasses,
-            'isBodyClassesDeleted'    => $this->isBodyClassesDeleted,
-        ];
+        $result = [];
+        foreach ($this->propertyMap as $property) {
+            $result[$property] = $this->{$property};
+        }
+
+        return $result;
     }
 
     /**
@@ -221,19 +233,22 @@ public function __toArray()
      *
      * @param array $data
      * @return void
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function populateWithArray(array $data)
     {
-        $this->assets = isset($data['assets']) ? $data['assets'] : [];
-        $this->removeAssets = isset($data['removeAssets']) ? $data['removeAssets'] : [];
-        $this->title = isset($data['title']) ? $data['title'] : '';
-        $this->metadata = isset($data['metadata']) ? $data['metadata'] : [];
-        $this->elementAttributes = isset($data['elementAttributes']) ? $data['elementAttributes'] : [];
-        $this->removeElementAttributes = isset($data['removeElementAttributes'])
-            ? $data['removeElementAttributes']
-            : [];
-        $this->bodyClasses = isset($data['bodyClasses']) ? $data['bodyClasses'] : [];
-        $this->isBodyClassesDeleted = isset($data['isBodyClassesDeleted']) ? $data['isBodyClassesDeleted'] : false;
+        foreach ($this->propertyMap as $property) {
+            $this->{$property} = $this->getDataValue($property, $data);
+        }
+    }
+
+    /**
+     * Get value from array by key.
+     *
+     * @param string $name
+     * @param array $data
+     * @return array
+     */
+    private function getDataValue($name, array $data) {
+        return isset($data[$name]) ? $data[$name] : [];
     }
 }

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

@@ -4,6 +4,7 @@
  * See COPYING.txt for license details.
  */
 namespace Magento\Framework\View\Test\Unit;
+
 use Magento\Framework\Serialize\SerializerInterface;
 
 /**
@@ -193,7 +194,6 @@ protected function setUp()
                 return json_decode($value, true);
             });
 
-
         $this->model = new \Magento\Framework\View\Layout(
             $this->processorFactoryMock,
             $this->eventManagerMock,