B2B-2058: ImageUploader uses Name class which works only with local FS

Author: NadiyaS

lib/internal/Magento/Framework/File/Name.php

@@ -32,7 +32,7 @@ public function __construct(Filesystem $filesystem = null)
     }
 
     /**
-     * Get new file name if the given name is in use
+     * Gets new file name if the given name is in use
      *
      * @param string $destinationFile
      * @return string
@@ -46,24 +46,23 @@ public function getNewFileName(string $destinationFile)
             Filesystem\DriverPool::FILE
         )->getDriver();
 
+        if ($driver->isExists($destinationFile)) {
+            return $this->generateFileName($driver, $fileInfo);
+        }
+
         /**
          * Try with non-local driver.
          */
-        if (!$driver->isExists($destinationFile)) {
-            $driver = $this->filesystem->getDirectoryWrite(
-                DirectoryList::ROOT
-            )->getDriver();
-        }
+        $driver = $this->filesystem->getDirectoryWrite(DirectoryList::ROOT)->getDriver();
+
+        return $driver->isExists($destinationFile)
+            ? $this->generateFileName($driver, $fileInfo)
+            : $fileInfo['basename'];
 
-        if ($driver->isExists($destinationFile)) {
-            return $this->generateFileName($driver, $fileInfo);
-        } else {
-            return $fileInfo['basename'];
-        }
     }
 
     /**
-     * Generates new file name until file with provided name doesn't exists
+     * Generates new file name until file with provided name doesn't exist
      *
      * @param DriverInterface $driver
      * @param string $fileInfo
@@ -81,7 +80,7 @@ private function generateFileName($driver, $fileInfo, $index = 1)
     }
 
     /**
-     * Get the path information from a given file
+     * Gets the path information from a given file
      *
      * @param string $destinationFile
      * @return string|string[]