MAGETWO-58918: Unable to create custom image attribute in category - for 2.1.x

Author: nmalevanec

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

@@ -266,7 +266,8 @@ public function execute()
     public function imagePreprocessing(array $data)
     {
         $emptyImageAttributes = $this->getEmptyImageAttributes($data);
-        foreach ($emptyImageAttributes as $attributeCode => $attributeModel) {
+        $attributeCodes = array_keys($emptyImageAttributes);
+        foreach ($attributeCodes as $attributeCode) {
             $data[$attributeCode] = false;
         }
 

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

@@ -224,7 +224,8 @@ public function getData()
     private function convertValues(Category $category, array $categoryData)
     {
         $imageAttributes = $this->getImageAttributes($category, $categoryData);
-        foreach ($imageAttributes as $attributeCode => $attribute) {
+        $attributeCodes = array_keys($imageAttributes);
+        foreach ($attributeCodes as $attributeCode) {
             unset($categoryData[$attributeCode]);
             $categoryData[$attributeCode][0]['name'] = $category->getData($attributeCode);
             $categoryData[$attributeCode][0]['url'] = $category->getImageUrl($attributeCode);

lib/internal/Magento/Framework/App/Utility/Files.php

@@ -1287,33 +1287,7 @@ public function classFileExists($class, &$path = '')
 
         $directories = array_merge($directories, $this->getPaths());
 
-        foreach ($directories as $dir) {
-            $fullPath = $dir . '/' . $path;
-            if ($this->classFileExistsCheckContent($fullPath, $namespace, $className)) {
-                return true;
-            }
-            $classParts = explode('/', $path, 3);
-            if (count($classParts) >= 3) {
-                // Check if it's PSR-4 class with trimmed vendor and package name parts
-                $trimmedFullPath = $dir . '/' . $classParts[2];
-                if ($this->classFileExistsCheckContent($trimmedFullPath, $namespace, $className)) {
-                    return true;
-                }
-            }
-            $classParts = explode('/', $path, 4);
-            if (count($classParts) >= 4) {
-                // Check if it's a library under framework directory
-                $trimmedFullPath = $dir . '/' . $classParts[3];
-                if ($this->classFileExistsCheckContent($trimmedFullPath, $namespace, $className)) {
-                    return true;
-                }
-                $trimmedFullPath = $dir . '/' . $classParts[2] . '/' . $classParts[3];
-                if ($this->classFileExistsCheckContent($trimmedFullPath, $namespace, $className)) {
-                    return true;
-                }
-            }
-        }
-        return false;
+        return $this->checkDirectories($path, $directories, $namespace, $className);
     }
 
     /**
@@ -1555,4 +1529,45 @@ protected function getFilesSubset(array $dirPatterns, $fileNamePattern, $exclude
         }
         return $fileSet;
     }
+
+    /**
+     * Check class exists in searchable directories.
+     *
+     * @param string $path
+     * @param array $directories
+     * @param string $namespace
+     * @param string $className
+     * @return bool
+     */
+    private function checkDirectories(&$path, $directories, $namespace, $className)
+    {
+        foreach ($directories as $dir) {
+            $fullPath = $dir . '/' . $path;
+            if ($this->classFileExistsCheckContent($fullPath, $namespace, $className)) {
+                return true;
+            }
+            $classParts = explode('/', $path, 3);
+            if (count($classParts) >= 3) {
+                // Check if it's PSR-4 class with trimmed vendor and package name parts
+                $trimmedFullPath = $dir . '/' . $classParts[2];
+                if ($this->classFileExistsCheckContent($trimmedFullPath, $namespace, $className)) {
+                    return true;
+                }
+            }
+            $classParts = explode('/', $path, 4);
+            if (count($classParts) >= 4) {
+                // Check if it's a library under framework directory
+                $trimmedFullPath = $dir . '/' . $classParts[3];
+                if ($this->classFileExistsCheckContent($trimmedFullPath, $namespace, $className)) {
+                    return true;
+                }
+                $trimmedFullPath = $dir . '/' . $classParts[2] . '/' . $classParts[3];
+                if ($this->classFileExistsCheckContent($trimmedFullPath, $namespace, $className)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
 }