Merge remote-tracking branch 'tango/MC-29519' into DEC-PR-01

dhorytskyi · dhorytskyi · commit c42c3eb37502 · 2019-12-16T17:26:28.000-06:00
diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -117,7 +117,8 @@ private function checkUniqueImageName(string $imageName): string
             $this->imageUploader->getBasePath() . DIRECTORY_SEPARATOR . $imageName
         );
 
-        $imageName = Uploader::getNewFilename($imageAbsolutePath);
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
+        $imageName = call_user_func([Uploader::class, 'getNewFilename'], $imageAbsolutePath);
 
         return $imageName;
     }

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,8 @@ private function checkUniqueImageName(string $imageName): string`
`117`	`117`	`$this->imageUploader->getBasePath() . DIRECTORY_SEPARATOR . $imageName`
`118`	`118`	`);`
`119`	`119`
`120`		`- $imageName = Uploader::getNewFilename($imageAbsolutePath);`
	`120`	`+ // phpcs:ignore Magento2.Functions.DiscouragedFunction`
	`121`	`+ $imageName = call_user_func([Uploader::class, 'getNewFilename'], $imageAbsolutePath);`
`121`	`122`
`122`	`123`	`return $imageName;`
`123`	`124`	`}`