MAGETWO-48516: Most of category fields don't have Use Default Value option in Store/StoreView scope on the redesigned category page

Author: shiftedreality

app/code/Magento/Catalog/Model/Category/DataProvider.php

@@ -216,7 +216,6 @@ private function addUseDefaultValueCheckbox(Category $category, array $meta)
                     )
                 ]
             );
-
         }
 
         return $meta;

lib/internal/Magento/Framework/Stdlib/ArrayManager.php

@@ -30,7 +30,7 @@ class ArrayManager
     /**
      * Check if node exists
      *
-     * @param string $path
+     * @param array|string $path
      * @param array $data
      * @param string $delimiter
      * @return bool
@@ -43,7 +43,7 @@ public function exists($path, array $data, $delimiter = self::DEFAULT_PATH_DELIM
     /**
      * Retrieve node
      *
-     * @param string $path
+     * @param array|string $path
      * @param array $data
      * @param null $defaultValue
      * @param string $delimiter
@@ -57,7 +57,7 @@ public function get($path, array $data, $defaultValue = null, $delimiter = self:
     /**
      * Set value into node and return modified data
      *
-     * @param string $path
+     * @param array|string $path
      * @param array $data
      * @param mixed $value
      * @param string $delimiter
@@ -75,7 +75,7 @@ public function set($path, array $data, $value, $delimiter = self::DEFAULT_PATH_
     /**
      * Set value into existing node and return modified data
      *
-     * @param string $path
+     * @param array|string $path
      * @param array $data
      * @param mixed $value
      * @param string $delimiter
@@ -93,7 +93,7 @@ public function replace($path, array $data, $value, $delimiter = self::DEFAULT_P
     /**
      * Move value from one location to another
      *
-     * @param string $path
+     * @param array|string $path
      * @param string $targetPath
      * @param array $data
      * @param bool $overwrite
@@ -120,7 +120,7 @@ public function move($path, $targetPath, array $data, $overwrite = false, $delim
     /**
      * Merge value with node and return modified data
      *
-     * @param string $path
+     * @param array|string $path
      * @param array $data
      * @param array $value
      * @param string $delimiter
@@ -141,7 +141,7 @@ public function merge($path, array $data, array $value, $delimiter = self::DEFAU
     /**
      * Populate nested array if possible and needed
      *
-     * @param string $path
+     * @param array|string $path
      * @param array $data
      * @param string $delimiter
      * @return array
@@ -156,7 +156,7 @@ public function populate($path, array $data, $delimiter = self::DEFAULT_PATH_DEL
     /**
      * Remove node and return modified data
      *
-     * @param string $path
+     * @param array|string $path
      * @param array $data
      * @param string $delimiter
      * @return array

lib/internal/Magento/Framework/Stdlib/Test/Unit/ArrayManagerTest.php

@@ -139,6 +139,12 @@ public function setDataProvider()
                 'data' => ['existing' => ['path' => 1]],
                 'value' => 'valuable data',
                 'result' => ['existing' => ['path' => 1], 'new' => ['path' => [2 => 'valuable data']]]
+            ],
+            3 => [
+                'path' => ['new', 'path/2'],
+                'data' => ['existing' => ['path' => 1]],
+                'value' => 'valuable data',
+                'result' => ['existing' => ['path' => 1], 'new' => ['path' => [2 => 'valuable data']]]
             ]
         ];
     }
@@ -178,6 +184,12 @@ public function setReplaceProvider()
                 'data' => ['existing' => ['path' => 1]],
                 'value' => 'valuable data',
                 'result' => ['existing' => ['path' => 1]]
+            ],
+            3 => [
+                'path' => ['new', 'path', '2'],
+                'data' => ['existing' => ['path' => 1]],
+                'value' => 'valuable data',
+                'result' => ['existing' => ['path' => 1]]
             ]
         ];
     }
@@ -228,6 +240,13 @@ public function moveDataProvider()
                 'data' => ['valid' => ['path' => 'value'], 'target' => ['path' => 'exists']],
                 'overwrite' => true,
                 'result' => ['valid' => [], 'target' => ['path' => 'value']]
+            ],
+            4 => [
+                'path' => ['valid', 'path'],
+                'targetPath' => 'target/path',
+                'data' => ['valid' => ['path' => 'value'], 'target' => ['path' => 'exists']],
+                'overwrite' => true,
+                'result' => ['valid' => [], 'target' => ['path' => 'value']]
             ]
         ];
     }
@@ -267,7 +286,13 @@ public function mergeDataProvider()
                 'data' => [],
                 'value' => [true],
                 'result' => []
-            ]
+            ],
+            3 => [
+                'path' => ['0', 'path/1'],
+                'data' => [['path' => [false, ['value' => false]]]],
+                'value' => ['value' => true, 'new_value' => false],
+                'result' => [['path' => [false, ['value' => true, 'new_value' => false]]]]
+            ],
         ];
     }
 
@@ -337,7 +362,12 @@ public function removeDataProvider()
                 'path' => 'invalid',
                 'data' => [true],
                 'result' => [true]
-            ]
+            ],
+            3 => [
+                'path' => ['simple'],
+                'data' => ['simple' => true, 'complex' => false],
+                'result' => ['complex' => false]
+            ],
         ];
     }
 
@@ -550,7 +580,7 @@ public function slicePathDataProvider()
                 'offset' => -6,
                 'length' => 3,
                 'result' => 'path/0/goes'
-            ]
+            ],
         ];
     }