MAGETWO-52958: Better Semantic for UI Components

Karpenko, Oleksandr · Karpenko, Oleksandr · commit 329bdb2a8312 · 2017-04-12T13:34:01.000+03:00
diff --git a/app/code/Magento/Ui/Config/Data.php b/app/code/Magento/Ui/Config/Data.php
@@ -84,7 +84,6 @@ public function __construct(
         $this->componentName = $componentName;
         $this->argumentInterpreter = $argumentInterpreter;
         $this->cacheId = static::CACHE_ID . '_' . $componentName;
-        $this->initData();
     }
 
     /**
@@ -121,7 +120,7 @@ private function initData()
      */
     public function merge(array $config)
     {
-        $this->data = array_replace_recursive($this->data, $config);
+        $this->data = array_replace_recursive($this->get(), $config);
     }
 
     /**
@@ -133,6 +132,9 @@ public function merge(array $config)
      */
     public function get($path = null, $default = null)
     {
+        if (empty($this->data)) {
+            $this->initData();
+        }
         if ($path === null) {
             return $this->data;
         }

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ public function __construct(`
`84`	`84`	`$this->componentName = $componentName;`
`85`	`85`	`$this->argumentInterpreter = $argumentInterpreter;`
`86`	`86`	`$this->cacheId = static::CACHE_ID . '_' . $componentName;`
`87`		`- $this->initData();`
`88`	`87`	`}`
`89`	`88`
`90`	`89`	`/**`
`@@ -121,7 +120,7 @@ private function initData()`
`121`	`120`	`*/`
`122`	`121`	`public function merge(array $config)`
`123`	`122`	`{`
`124`		`- $this->data = array_replace_recursive($this->data, $config);`
	`123`	`+ $this->data = array_replace_recursive($this->get(), $config);`
`125`	`124`	`}`
`126`	`125`
`127`	`126`	`/**`
`@@ -133,6 +132,9 @@ public function merge(array $config)`
`133`	`132`	`*/`
`134`	`133`	`public function get($path = null, $default = null)`
`135`	`134`	`{`
	`135`	`+ if (empty($this->data)) {`
	`136`	`+ $this->initData();`
	`137`	`+ }`
`136`	`138`	`if ($path === null) {`
`137`	`139`	`return $this->data;`
`138`	`140`	`}`