AC-8384: Zend_Validate_File_Upload- undefined class on 2.4.6

Author: glo17720

app/code/Magento/ImportExport/Model/Source/Upload.php

@@ -18,6 +18,7 @@
 use Magento\MediaStorage\Model\File\Uploader;
 use Magento\MediaStorage\Model\File\UploaderFactory;
 use Laminas\Validator\File\Upload as FileUploadValidator;
+use Laminas\File\Transfer\Adapter\Http;
 
 class Upload
 {
@@ -46,6 +47,10 @@ class Upload
      */
     private $varDirectory;
 
+    /**
+     * @param WriteInterface $varDirectory
+     */
+
     /**
      * @param FileTransferFactory $httpFactory
      * @param DataHelper $importExportData
@@ -75,7 +80,9 @@ public function __construct(
      */
     public function uploadSource(string $entity)
     {
-        /** @var $adapter \Laminas\File\Transfer\Adapter\Http */
+        /**
+         * @var $adapter \Laminas\File\Transfer\Adapter\Http
+         */
         $adapter = $this->httpFactory->create();
         if (!$adapter->isValid(Import::FIELD_NAME_SOURCE_FILE)) {
             $errors = $adapter->getErrors();
@@ -87,7 +94,9 @@ public function uploadSource(string $entity)
             throw new LocalizedException($errorMessage);
         }
 
-        /** @var $uploader Uploader */
+        /**
+         * @var $uploader Uploader
+         */
         $uploader = $this->uploaderFactory->create(['fileId' => Import::FIELD_NAME_SOURCE_FILE]);
         $uploader->setAllowedExtensions(['csv', 'zip']);
         $uploader->skipDbProcessing(true);

app/code/Magento/ImportExport/Test/Unit/Model/Source/UploadTest.php

@@ -16,82 +16,69 @@
 use Magento\ImportExport\Model\Source\Upload;
 use Magento\MediaStorage\Model\File\Uploader;
 use Magento\MediaStorage\Model\File\UploaderFactory;
-use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class UploadTest extends TestCase
 {
     /**
-     * @var FileTransferFactory|MockObject
+     * Directory paths sample
+     */
+    const DIRECTORY_ABSOLUTE_PATH = 'dasdad';
+    /**
+     * Allowed Extensions to Upload a file
+     */
+    const ALLOWED_EXTENSIONS = ['csv', 'zip'];
+    /**
+     * The name to use when saving the uploaded file
+     */
+    const SAVED_FILE_NAME = 'testString';
+    /**
+     * The ID of the file being imported.
      */
-    protected $httpFactoryMock;
+    const IMPORT_FILE_ID = 'import_file';
+
     /**
      * @var Upload
      */
     private Upload $upload;
+
     /**
-     * @var DataHelper|MockObject
+     * @var FileTransferFactory|MockObject
      */
-    private $importExportDataMock;
+    protected FileTransferFactory|MockObject $httpFactoryMock;
 
     /**
-     * @var UploaderFactory|MockObject
+     * @var DataHelper|\PHPUnit\Framework\MockObject\MockObject
      */
-    private $uploaderFactoryMock;
+    private DataHelper|MockObject $importExportDataMock;
 
     /**
-     * @var Random|MockObject
+     * @var UploaderFactory|\PHPUnit\Framework\MockObject\MockObject
      */
-    private $randomMock;
+    private UploaderFactory|MockObject $uploaderFactoryMock;
 
     /**
-     * @var MockObject|MockObject
+     * @var Random|\PHPUnit\Framework\MockObject\MockObject
      */
-    private MockObject $filesystemMock;
+    private Random|MockObject $randomMock;
+
+    /**
+     * @var Filesystem|MockObject
+     */
+    protected Filesystem|MockObject $filesystemMock;
 
     /**
      * @var Http|MockObject
      */
-    private Http $adapterMock;
+    private Http|MockObject $adapterMock;
 
     /**
      * @var Uploader
      */
     private Uploader $uploaderMock;
-    /**
-     * Test importSource() method
-     */
-    public function testUploadSource(): void
-    {
-        $this->adapterMock
-            ->method('isValid')
-            ->willReturn(true);
-        $this->httpFactoryMock
-            ->method('create')
-            ->willReturn($this->adapterMock);
-        $this->uploaderMock = $this->createMock(Uploader::class);
-        $this->uploaderMock
-            ->method('setAllowedExtensions')
-            ->with(['csv', 'zip']);
-        $this->uploaderMock
-            ->method('skipDbProcessing')
-            ->with(true);
-        $this->uploaderFactoryMock
-            ->method('create')
-            ->with(['fileId' => 'import_file'])
-            ->willReturn($this->uploaderMock);
-        $this->randomMock
-            ->method('getRandomString')
-            ->with(32);
-        $this->uploaderMock
-            ->method('save')
-            ->willReturn(['file' => 'testString']);
-        $result = $this->upload->uploadSource('testString');
-        $this->assertIsArray($result);
-    }
 
     /**
-     * Set up
+     * @inheritDoc
      */
     protected function setUp(): void
     {
@@ -111,13 +98,9 @@ protected function setUp(): void
         $directoryWrite = $this->getMockBuilder(WriteInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $directoryWrite
-            ->expects($this->once())
-            ->method('getAbsolutePath')
-            ->willReturn('dasdad');
-        $this->filesystemMock
-            ->expects($this->once())
-            ->method('getDirectoryWrite')
+        $directoryWrite->expects($this->once())->method('getAbsolutePath')
+            ->willReturn(self::DIRECTORY_ABSOLUTE_PATH);
+        $this->filesystemMock->expects($this->once())->method('getDirectoryWrite')
             ->willReturn($directoryWrite);
         $this->upload = new Upload(
             $this->httpFactoryMock,
@@ -127,4 +110,26 @@ protected function setUp(): void
             $this->filesystemMock
         );
     }
+
+    /**
+     * Test that the uploadSource method uploads a file and returns an array.
+     *
+     * @return void
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    public function testUploadSource(): void
+    {
+        $this->adapterMock->method('isValid')->willReturn(true);
+        $this->httpFactoryMock->method('create')->willReturn($this->adapterMock);
+        $this->uploaderMock = $this->createMock(Uploader::class);
+        $this->uploaderMock->method('setAllowedExtensions')->with(self::ALLOWED_EXTENSIONS);
+        $this->uploaderMock->method('skipDbProcessing')->with(true);
+        $this->uploaderFactoryMock->method('create')
+            ->with(['fileId' => self::IMPORT_FILE_ID])
+            ->willReturn($this->uploaderMock);
+        $this->randomMock->method('getRandomString')->with(32);
+        $this->uploaderMock->method('save')->willReturn(['file' => self::SAVED_FILE_NAME]);
+        $result = $this->upload->uploadSource(self::SAVED_FILE_NAME);
+        $this->assertIsArray($result);
+    }
 }