Code reformatted after style-checking failures

Author: Allan Paiste

app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php

@@ -64,26 +64,16 @@ public function __construct(
     }
 
     /**
-     * @param array|bool|null $value Attribute value
-     * @return bool
+     * @param array $value Attribute value
+     * @return string
      */
     protected function getUploadedImageName($value)
     {
-        if (!is_array($value)) {
-            return false;
+        if (is_array($value) && isset($value[0]['name'])) {
+            return $value[0]['name'];
         }
 
-        if (!count($value)) {
-            return false;
-        }
-
-        $imageData = reset($value);
-
-        if (!isset($imageData['name'])) {
-            return false;
-        }
-
-        return $imageData['name'];
+        return '';
     }
 
     /**
@@ -133,14 +123,12 @@ public function afterSave($object)
     {
         $value = $object->getData($this->getAttribute()->getName() . self::ADDITIONAL_DATA_SUFFIX);
 
-        if (!$imageName = $this->getUploadedImageName($value)) {
-            return $this;
-        }
-
-        try {
-            $this->getImageUploader()->moveFileFromTmp($imageName);
-        } catch (\Exception $e) {
-            $this->_logger->critical($e);
+        if ($imageName = $this->getUploadedImageName($value)) {
+            try {
+                $this->getImageUploader()->moveFileFromTmp($imageName);
+            } catch (\Exception $e) {
+                $this->_logger->critical($e);
+            }
         }
 
         return $this;

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

@@ -17,6 +17,7 @@
 use Magento\Ui\DataProvider\EavValidationRules;
 use Magento\Catalog\Model\CategoryFactory;
 use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Catalog\Model\Category\Attribute\Backend\Image as ImageBackendModel;
 
 /**
  * Class DataProvider
@@ -206,21 +207,7 @@ public function getData()
             $categoryData = $this->addUseDefaultSettings($category, $categoryData);
             $categoryData = $this->addUseConfigSettings($categoryData);
             $categoryData = $this->filterFields($categoryData);
-
-            foreach ($category->getAttributes() as $attributeCode => $attribute) {
-                $backendModel = $attribute->getBackend();
-
-                if (!isset($categoryData[$attributeCode])) {
-                    continue;
-                }
-
-                if ($backendModel instanceof \Magento\Catalog\Model\Category\Attribute\Backend\Image) {
-                    unset($categoryData[$attributeCode]);
-
-                    $categoryData[$attributeCode][0]['name'] = $category->getData($attributeCode);
-                    $categoryData[$attributeCode][0]['url'] = $category->getImageUrl($attributeCode);
-                }
-            }
+            $categoryData = $this->convertValues($category, $categoryData);
 
             $this->loadedData[$category->getId()] = $categoryData;
         }
@@ -382,6 +369,29 @@ protected function filterFields($categoryData)
         return array_diff_key($categoryData, array_flip($this->ignoreFields));
     }
 
+    /**
+     * @param \Magento\Catalog\Model\Category $category
+     * @param array $categoryData
+     * @return array
+     */
+    protected function convertValues($category, $categoryData)
+    {
+        foreach ($category->getAttributes() as $attributeCode => $attribute) {
+            if (!isset($categoryData[$attributeCode])) {
+                continue;
+            }
+
+            if ($attribute->getBackend() instanceof ImageBackendModel) {
+                unset($categoryData[$attributeCode]);
+
+                $categoryData[$attributeCode][0]['name'] = $category->getData($attributeCode);
+                $categoryData[$attributeCode][0]['url'] = $category->getImageUrl($attributeCode);
+            }
+        }
+
+        return $categoryData;
+    }
+
     /**
      * Category's fields default values
      *

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/Image/UploadTest.php

@@ -7,6 +7,10 @@
 
 use \Magento\Catalog\Controller\Adminhtml\Category\Image\Upload as Model;
 use \Magento\Framework\App\Request\Http as Request;
+use \Magento\Catalog\Model\ImageUploader;
+use \Magento\Framework\Controller\ResultFactory;
+use \Magento\Framework\DataObject;
+use \Magento\Backend\App\Action\Context;
 
 /**
  * Class UploadTest
@@ -40,18 +44,16 @@ public function testExecuteShouldSaveUploadedImageWithSpecifiedNameToTmpFolder($
     {
         $request = $this->objectManager->getObject(Request::class);
 
-        $uploader = $this->getMock(
-            \Magento\Catalog\Model\ImageUploader::class, ['saveFileToTmpDir'], [], '', false);
+        $uploader = $this->getMock(ImageUploader::class, ['saveFileToTmpDir'], [], '', false);
 
-        $resultFactory = $this->getMock(
-            \Magento\Framework\Controller\ResultFactory::class, ['create'], [], '', false);
+        $resultFactory = $this->getMock(ResultFactory::class, ['create'], [], '', false);
 
         $resultFactory->expects($this->once())
             ->method('create')
-            ->will($this->returnValue(new \Magento\Framework\DataObject()));
+            ->will($this->returnValue(new DataObject()));
 
         $model = $this->objectManager->getObject(Model::class, [
-            'context' => $this->objectManager->getObject(\Magento\Backend\App\Action\Context::class, [
+            'context' => $this->objectManager->getObject(Context::class, [
                 'request' => $request,
                 'resultFactory' => $resultFactory
             ]),
@@ -67,4 +69,4 @@ public function testExecuteShouldSaveUploadedImageWithSpecifiedNameToTmpFolder($
 
         $model->execute();
     }
-}
+}

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Category/SaveTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Catalog\Test\Unit\Controller\Adminhtml\Category;
 
+use \Magento\Catalog\Controller\Adminhtml\Category\Save as Model;
+
 /**
  * Class SaveTest
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -628,10 +630,13 @@ public function testImagePreprocessingShouldNotSetValueToFalseWhenValueSet()
     {
         $eavConfig = $this->getMock(\Magento\Eav\Model\Config::class, ['getEntityType'], [], '', false);
 
+        $imageBackendModel = $this->objectManager->getObject(
+            \Magento\Catalog\Model\Category\Attribute\Backend\Image::class);
+
         $collection = new \Magento\Framework\DataObject(['attribute_collection' => [
             new \Magento\Framework\DataObject([
                 'attribute_code' => 'attribute1',
-                'backend' => $this->objectManager->getObject(\Magento\Catalog\Model\Category\Attribute\Backend\Image::class)
+                'backend' => $imageBackendModel
             ]),
             new \Magento\Framework\DataObject([
                 'attribute_code' => 'attribute2',
@@ -644,7 +649,7 @@ public function testImagePreprocessingShouldNotSetValueToFalseWhenValueSet()
             ->with(\Magento\Catalog\Api\Data\CategoryAttributeInterface::ENTITY_TYPE_CODE)
             ->will($this->returnValue($collection));
 
-        $model = $this->objectManager->getObject(\Magento\Catalog\Controller\Adminhtml\Category\Save::class, [
+        $model = $this->objectManager->getObject(Model::class, [
             'eavConfig' => $eavConfig
         ]);