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

Author: NadiyaS

dev/tests/integration/testsuite/Magento/Framework/File/NameTest.php

@@ -0,0 +1,74 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\File;
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * Test for \Magento\Framework\File\Uploader
+ *
+ * @magentoDataFixture Magento/Framework/File/_files/framework_file_name.php
+ */
+class NameTest extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var Name
+     */
+    private $nameModel;
+
+    /**
+     * @var WriteInterface
+     */
+    private $mediaDirectory;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)
+            ->getDirectoryWrite(DirectoryList::MEDIA);
+        $this->nameModel = $objectManager->get(Name::class);
+    }
+
+    /**
+     *
+     * @return void
+     * @magentoDataFixture Magento/Framework/File/_files/framework_file_name.php
+     *
+     * @dataProvider getNewFileNameDataProvider
+     */
+
+    /**
+     * @param string $destinationFile
+     * @param string $expectedFileName
+     * @return void
+     *
+     * @throws \Magento\Framework\Exception\FileSystemException
+     *
+     * @dataProvider getNewFileNameDataProvider
+     */
+    public function testGetNewFileName($destinationFile, $expectedFileName)
+    {
+        $path = $this->mediaDirectory->getAbsolutePath('image/' . $destinationFile);
+        $name = $this->nameModel->getNewFileName($path);
+        $this->assertEquals($expectedFileName, $name);
+    }
+
+    public function getNewFileNameDataProvider()
+    {
+        return [
+            ['image.jpg', 'image.jpg'],
+            ['image_one.jpg', 'image_one_1.jpg'],
+            ['image_two.jpg', 'image_two_2.jpg']
+        ];
+    }
+}

dev/tests/integration/testsuite/Magento/Framework/File/_files/framework_file_name.php

@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+/** @var $mediaDirectory \Magento\Framework\Filesystem\Directory\WriteInterface */
+$mediaDirectory = $objectManager->get(\Magento\Framework\Filesystem::class)->getDirectoryWrite(DirectoryList::MEDIA);
+$dir = 'image';
+$mediaDirectory->create($dir);
+$imageContent = file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . 'magento_small_image.jpg');
+$driver = $mediaDirectory->getDriver();
+$driver->filePutContents($mediaDirectory->getAbsolutePath($dir . '/image_one.jpg'), $imageContent);
+$driver->filePutContents($mediaDirectory->getAbsolutePath($dir . '/image_two.jpg'), $imageContent);
+$driver->filePutContents($mediaDirectory->getAbsolutePath($dir . '/image_two_1.jpg'), $imageContent);
+unset($imageContent);

dev/tests/integration/testsuite/Magento/Framework/File/_files/framework_file_name_rollback.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Framework\App\Filesystem\DirectoryList;
+
+/** @var \Magento\Framework\Filesystem\Directory\WriteInterface $mediaDirectory */
+$mediaDirectory = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
+    \Magento\Framework\Filesystem::class
+)->getDirectoryWrite(
+    DirectoryList::MEDIA
+);
+
+$mediaDirectory->delete('image');

dev/tests/integration/testsuite/Magento/Framework/File/_files/magento_small_image.jpg

@@ -8,27 +8,38 @@
 namespace Magento\Framework\File;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
-use Magento\Framework\Exception\FileSystemException;
-use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Filesystem\Directory\TargetDirectory;
 
 /**
  * Utility for generating a unique file name
  */
 class Name
 {
+    /**
+     * @var \Magento\Framework\Filesystem\Directory\TargetDirectory
+     */
+    private $targetDirectory;
+
+    public function __construct(TargetDirectory $targetDirectory = null)
+    {
+        $this->targetDirectory = $targetDirectory ?? ObjectManager::getInstance()->get(TargetDirectory::class);
+    }
+
     /**
      * Get new file name if the given name is in use
      *
      * @param string $destinationFile
      * @return string
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     public function getNewFileName(string $destinationFile)
     {
         $fileInfo = $this->getPathInfo($destinationFile);
-        if ($this->fileExist($destinationFile)) {
+        if ($this->targetDirectory->getDirectoryWrite(DirectoryList::ROOT)->isExist($destinationFile)) {
             $index = 1;
             $baseName = $fileInfo['filename'] . '.' . $fileInfo['extension'];
-            while ($this->fileExist($fileInfo['dirname'] . '/' . $baseName)) {
+            while ($this->targetDirectory->getDirectoryWrite(DirectoryList::ROOT)->isExist($fileInfo['dirname'] . '/' . $baseName)) {
                 $baseName = $fileInfo['filename'] . '_' . $index . '.' . $fileInfo['extension'];
                 $index++;
             }
@@ -50,15 +61,4 @@ private function getPathInfo(string $destinationFile)
     {
         return pathinfo($destinationFile);
     }
-
-    /**
-     * Check to see if a given file exists
-     *
-     * @param string $destinationFile
-     * @return bool
-     */
-    private function fileExist(string $destinationFile)
-    {
-        return file_exists($destinationFile);
-    }
 }