MAGETWO-58335: [Backport] - Can't view uploaded image - for 2.1

Author: Alex Paliarush

app/code/Magento/Customer/Controller/Adminhtml/File/Address/Upload.php

@@ -114,7 +114,7 @@ public function execute()
      */
     private function convertFilesArray()
     {
-        foreach($_FILES['address'] as $itemKey => $item) {
+        foreach ($_FILES['address'] as $itemKey => $item) {
             foreach ($item as $value) {
                 if (is_array($value)) {
                     $_FILES['address'][$itemKey] = [

app/code/Magento/Customer/Controller/Adminhtml/Index/Save.php

@@ -13,6 +13,9 @@
 use Magento\Customer\Model\Metadata\Form;
 use Magento\Framework\Exception\LocalizedException;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Save extends \Magento\Customer\Controller\Adminhtml\Index
 {
     /**

app/code/Magento/Customer/Model/Customer/DataProvider.php

@@ -130,6 +130,7 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
      * @param FileProcessorFactory $fileProcessorFactory
      * @param array $meta
      * @param array $data
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         $name,
@@ -221,6 +222,7 @@ public function getData()
      *
      * @param Customer|Address $entity
      * @param array $entityData
+     * @return void
      */
     private function overrideFileUploaderData($entity, array &$entityData)
     {
@@ -244,6 +246,7 @@ private function overrideFileUploaderData($entity, array &$entityData)
      * @param Attribute $attribute
      * @param array $customerData
      * @return array
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     private function getFileUploaderData(
         Type $entityType,
@@ -343,6 +346,7 @@ protected function getAttributesMeta(Type $entityType)
      * @param Type $entityType
      * @param AbstractAttribute $attribute
      * @param array $config
+     * @return void
      */
     private function overrideFileUploaderMetadata(
         Type $entityType,
@@ -360,7 +364,12 @@ private function overrideFileUploaderMetadata(
 
             if (isset($config['validation']['file_extensions'])) {
                 $allowedExtensions = explode(',', $config['validation']['file_extensions']);
-                array_walk($allowedExtensions, function(&$value) { $value = strtolower(trim($value)); });
+                array_walk(
+                    $allowedExtensions,
+                    function (&$value) {
+                        $value = strtolower(trim($value));
+                    }
+                );
             }
 
             $allowedExtensions = implode(' ', $allowedExtensions);

app/code/Magento/Customer/Model/FileProcessor.php

@@ -16,6 +16,9 @@
 use Magento\MediaStorage\Model\File\Uploader;
 use Magento\MediaStorage\Model\File\UploaderFactory;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class FileProcessor
 {
     /**

app/code/Magento/Customer/Test/Unit/Controller/Account/EditPostTest.php

@@ -208,6 +208,9 @@ public function testNoPostValues()
         $this->assertSame($this->resultRedirect, $this->model->execute());
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testGeneralSave()
     {
         $customerId = 1;

app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php

@@ -367,6 +367,9 @@ function ($origName) {
         return [$attributeMock, $attributeBooleanMock];
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testGetData()
     {
         $customer = $this->getMockBuilder('Magento\Customer\Model\Customer')
@@ -476,6 +479,9 @@ public function testGetData()
         );
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testGetDataWithCustomerFormData()
     {
         $customerId = 11;
@@ -589,6 +595,9 @@ public function testGetDataWithCustomerFormData()
         $this->assertEquals([$customerId => $customerFormData], $dataProvider->getData());
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testGetDataWithCustomAttributeImage()
     {
         $customerId = 1;
@@ -810,6 +819,9 @@ public function testGetDataWithCustomAttributeImageNoData()
         $this->assertEquals($expectedData, $dataProvider->getData());
     }
 
+    /**
+     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     */
     public function testGetAttributesMetaWithCustomAttributeImage()
     {
         $maxFileSize = 1000;

app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php

@@ -75,7 +75,6 @@ private function getModel($entityTypeCode, array $allowedExtensions = [])
         return $model;
     }
 
-
     public function testGetStat()
     {
         $fileName = '/filename.ext1';

app/code/Magento/Customer/Test/Unit/Model/FileUploaderTest.php

@@ -179,7 +179,6 @@ public function testUpload()
             ->method('getValidationRules')
             ->willReturn([$validationRuleMock]);
 
-
         $model = $this->getModel(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER, 'customer');
         $this->assertEquals($expectedResult, $model->upload());
     }

app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/FileTest.php

@@ -14,6 +14,7 @@
 class FileTest extends AbstractFormTestCase
 {
     const ENTITY_TYPE = 0;
+
     /** @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Framework\Url\EncoderInterface */
     protected $urlEncode;
 

dev/tests/static/testsuite/Magento/Test/Legacy/ModuleDBChangeTest.php

@@ -15,7 +15,7 @@ class ModuleDBChangeTest extends \PHPUnit_Framework_TestCase
     /**
      * @var string
      */
-    protected static $changedFilesPattern = __DIR__ . '/../_files/changed_files*';
+    protected static $changedFilesPattern = '';
 
     /**
      * @var string
@@ -27,6 +27,7 @@ class ModuleDBChangeTest extends \PHPUnit_Framework_TestCase
      */
     public static function setUpBeforeClass()
     {
+        self::$changedFilesPattern = __DIR__ . '/../_files/changed_files*';
         foreach (glob(self::$changedFilesPattern) as $changedFile) {
             self::$changedFileList .= file_get_contents($changedFile) . PHP_EOL;
         }