AC-15399::[CE] PHPUnit 12: Upgrade Wishlist & Rating related test | Move Inline Anonymous Classes

cod43156 · cod43156 · commit 25cf9aecaf7c · 2025-10-01T22:49:06.000+05:30
diff --git a/app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/MediaGalleryTest.php b/app/code/Magento/CatalogGraphQl/Test/Unit/Model/Resolver/Product/MediaGalleryTest.php
@@ -13,6 +13,7 @@
 use Magento\CatalogGraphQl\Model\Resolver\Product\MediaGallery;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Magento\Framework\GraphQl\Config\Element\Field;
@@ -47,7 +48,7 @@ class MediaGalleryTest extends TestCase
     protected function setUp(): void
     {
         $this->fieldMock = $this->createMock(Field::class);
-        $this->contextMock = $this->getMockForAbstractClass(ContextInterface::class);
+        $this->contextMock = $this->createMock(ContextInterface::class);
         $this->infoMock = $this->createMock(ResolveInfo::class);
         $this->productMock = $this->getMockBuilder(Product::class)
             ->disableOriginalConstructor()
@@ -56,12 +57,12 @@ protected function setUp(): void
     }
 
     /**
-     * @dataProvider dataProviderForResolve
      * @param $expected
      * @param $productName
      * @return void
      * @throws Exception
      */
+    #[DataProvider('dataProviderForResolve')]
     public function testResolve($expected, $productName): void
     {
         $existingEntryMock = $this->getMockBuilder(Entry::class)
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/DatabaseTestHelper.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/DatabaseTestHelper.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Test\Unit\Helper;
+
+use Magento\MediaStorage\Model\File\Storage\Database;
+
+/**
+ * Test helper for Database class
+ */
+class DatabaseTestHelper extends Database
+{
+    /**
+     * @var string
+     */
+    private $content = 'content';
+
+    /**
+     * @var bool
+     */
+    private $id = true;
+
+    /**
+     * Constructor - skip parent constructor to avoid dependencies
+     */
+    public function __construct()
+    {
+        // Skip parent constructor to avoid dependency injection issues
+    }
+
+    /**
+     * Get content
+     *
+     * @return string
+     */
+    public function getContent()
+    {
+        return $this->content;
+    }
+
+    /**
+     * Set content
+     *
+     * @param string $content
+     * @return $this
+     */
+    public function setContent($content)
+    {
+        $this->content = $content;
+        return $this;
+    }
+
+    /**
+     * Get ID (alias for compatibility)
+     *
+     * @return bool
+     * @SuppressWarnings(PHPMD.BooleanGetMethodName)
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set ID
+     *
+     * @param bool $id
+     * @return $this
+     */
+    public function setId($id)
+    {
+        $this->id = $id;
+        return $this;
+    }
+
+    /**
+     * Load by filename
+     *
+     * @param string $filename
+     * @return $this
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function loadByFilename($filename)
+    {
+        return $this;
+    }
+}
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/DirectoryDatabaseTestHelper.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/DirectoryDatabaseTestHelper.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\MediaStorage\Test\Unit\Helper;
+
+use Magento\MediaStorage\Model\File\Storage\Directory\Database;
+
+/**
+ * Test helper for Directory\Database class
+ */
+class DirectoryDatabaseTestHelper extends Database
+{
+    /**
+     * @var string
+     */
+    private $path = '';
+
+    /**
+     * @var string
+     */
+    private $name = '';
+
+    /**
+     * Constructor - skip parent constructor to avoid dependencies
+     */
+    public function __construct()
+    {
+        // Skip parent constructor to avoid dependency injection issues
+    }
+
+    /**
+     * Set path
+     *
+     * @param string $path
+     * @return $this
+     */
+    public function setPath($path)
+    {
+        $this->path = $path;
+        return $this;
+    }
+
+    /**
+     * Get path
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * Set name
+     *
+     * @param string $name
+     * @return $this
+     */
+    public function setName($name)
+    {
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * Get name
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Save
+     *
+     * @return $this
+     */
+    public function save()
+    {
+        return $this;
+    }
+
+    /**
+     * Get parent ID
+     *
+     * @return int
+     */
+    public function getParentId()
+    {
+        return 1;
+    }
+}
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/Storage/DatabaseTest.php
@@ -18,6 +18,7 @@
 use Magento\MediaStorage\Helper\File\Storage\Database;
 use Magento\MediaStorage\Model\File\Storage;
 use Magento\MediaStorage\Model\File\Storage\DatabaseFactory;
+use Magento\Framework\Model\Test\Unit\Helper\AbstractDbTestHelper;
 use Magento\MediaStorage\Model\File\Storage\File;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -359,18 +360,7 @@ public function testDeleteFolder($storage, $callNum)
         $this->dbStorageFactoryMock->expects($this->exactly($callNum))
             ->method('create')
             ->willReturn($dbModelMock);
-        $resourceModelMock = new class extends AbstractDb {
-            public function __construct()
-            {
-            }
-            protected function _construct()
-            {
-            }
-            public function deleteFolder($path)
-            {
-                return true;
-            }
-        };
+        $resourceModelMock = new AbstractDbTestHelper();
         $dbModelMock->expects($this->exactly($callNum))
             ->method('getResource')
             ->willReturn($resourceModelMock);
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Helper/File/StorageTest.php b/app/code/Magento/MediaStorage/Test/Unit/Helper/File/StorageTest.php
@@ -14,6 +14,7 @@
 use Magento\MediaStorage\Helper\File\Storage;
 use Magento\MediaStorage\Helper\File\Storage\Database as DatabaseHelper;
 use Magento\MediaStorage\Model\File\Storage\File;
+use Magento\Framework\Model\Test\Unit\Helper\AbstractModelTestHelper;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -131,24 +132,7 @@ public function testProcessStorageFile($expected, $storage, $callNum, $callSaveF
             ->with($filename)
             ->willReturn($relativePath);
 
-        $storageModelMock = new class extends AbstractModel {
-            /**
-             * @var \Magento\MediaStorage\Model\File\Storage\Database
-             */
-            private $fileMock;
-            
-            public function __construct()
-            {
-            }
-            public function loadByFileName($filename)
-            {
-                return $this->fileMock;
-            }
-            public function setFileMock($fileMock)
-            {
-                $this->fileMock = $fileMock;
-            }
-        };
+        $storageModelMock = new AbstractModelTestHelper();
         $this->storageMock->expects($this->exactly($callNum))
             ->method('getStorageModel')
             ->willReturn($storageModelMock);
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/Directory/DatabaseTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/Directory/DatabaseTest.php
@@ -15,6 +15,7 @@
 use Magento\MediaStorage\Model\File\Storage;
 use Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory;
 use Magento\MediaStorage\Model\ResourceModel\File\Storage\Directory\Database;
+use Magento\MediaStorage\Test\Unit\Helper\DirectoryDatabaseTestHelper;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
@@ -85,27 +86,7 @@ protected function setUp(): void
         $this->registryMock = $this->createMock(Registry::class);
         $this->helperStorageDatabase = $this->createMock(DatabaseHelper::class);
         $this->dateModelMock = $this->createMock(DateTime::class);
-        $this->directoryMock = new class extends \Magento\MediaStorage\Model\File\Storage\Directory\Database {
-            public function __construct()
-            {
-            }
-            public function setPath($path)
-            {
-                return $this;
-            }
-            public function setName($name)
-            {
-                return $this;
-            }
-            public function save()
-            {
-                return $this;
-            }
-            public function getParentId()
-            {
-                return 1;
-            }
-        };
+        $this->directoryMock = new DirectoryDatabaseTestHelper();
         $this->directoryFactoryMock = $this->createPartialMock(
             DatabaseFactory::class, // @phpstan-ignore-line
             ['create']
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/ResponseTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/ResponseTest.php
@@ -58,8 +58,7 @@ protected function setUp(): void
     public function testSendResponse(): void
     {
         $filePath = 'file_path';
-        $headers = $this->getMockBuilder(Headers::class)
-            ->getMock();
+        $headers = $this->createMock(Headers::class);
         $this->response->setFilePath($filePath);
         $this->response->setHeaders($headers);
         $this->transferAdapter
diff --git a/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/SynchronizationTest.php b/app/code/Magento/MediaStorage/Test/Unit/Model/File/Storage/SynchronizationTest.php
@@ -13,6 +13,7 @@
 use Magento\MediaStorage\Model\File\Storage\Database;
 use Magento\MediaStorage\Model\File\Storage\DatabaseFactory;
 use Magento\MediaStorage\Model\File\Storage\Synchronization;
+use Magento\MediaStorage\Test\Unit\Helper\DatabaseTestHelper;
 use PHPUnit\Framework\TestCase;
 
 class SynchronizationTest extends TestCase
@@ -23,23 +24,7 @@ public function testSynchronize()
         $relativeFileName = 'config.xml';
 
         $storageFactoryMock = $this->createPartialMock(DatabaseFactory::class, ['create']); // @phpstan-ignore-line
-        $storageMock = new class extends Database {
-            public function __construct()
-            {
-            }
-            public function getContent()
-            {
-                return 'content';
-            }
-            public function getId()
-            {
-                return true;
-            }
-            public function loadByFilename($filename)
-            {
-                return $this;
-            }
-        };
+        $storageMock = new DatabaseTestHelper();
         $storageFactoryMock->expects($this->once())->method('create')->willReturn($storageMock);
 
         $file = $this->createPartialMock(
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/Helper/AbstractDbTestHelper.php b/lib/internal/Magento/Framework/Model/Test/Unit/Helper/AbstractDbTestHelper.php
diff --git a/lib/internal/Magento/Framework/Model/Test/Unit/Helper/AbstractModelTestHelper.php b/lib/internal/Magento/Framework/Model/Test/Unit/Helper/AbstractModelTestHelper.php
