ACP2E-782: Introduce an alternative way to define fixtures using PHP8 Attributes

Author: bubasuma

dev/tests/integration/framework/Magento/TestFramework/Annotation/Parser/Composite.php

@@ -23,15 +23,15 @@ class Composite implements ParserInterface
     /**
      * @var string
      */
-    private string $strategy;
+    private int $strategy;
 
     /**
      * @param ParserInterface[] $parsers
-     * @param string $strategy
+     * @param int $strategy
      */
     public function __construct(
         array $parsers,
-        string $strategy = self::STRATEGY_MERGE
+        int $strategy = self::STRATEGY_MERGE
     ) {
         $this->parsers = $parsers;
         $this->strategy = $strategy;

dev/tests/integration/framework/Magento/TestFramework/Fixture/IndexerDimensionMode.php

@@ -6,6 +6,7 @@
 declare(strict_types=1);
 
 namespace Magento\TestFramework\Fixture;
+
 use Attribute;
 
 #[Attribute(Attribute::TARGET_METHOD | Attribute::TARGET_CLASS)]

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AppAreaTest.php

@@ -9,6 +9,7 @@
 use Magento\Framework\App\Area;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Annotation\TestCaseAnnotation;
+use Magento\TestFramework\Fixture\Parser\AppArea;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\MockObject\MockObject;
 use ReflectionProperty;
@@ -46,10 +47,19 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
+        $sharedInstances = [
+            AppArea::class => $this->createConfiguredMock(AppArea::class, ['parse' => []])
+        ];
+        $objectManager->method('get')
+            ->willReturnCallback(
+                function (string $type) use ($sharedInstances) {
+                    return $sharedInstances[$type] ?? new $type();
+                }
+            );
         $objectManager->method('create')
             ->willReturnCallback(
-                function (string $type) {
-                    return $this->createMock($type);
+                function (string $type, array $arguments = []){
+                    return new $type(...array_values($arguments));
                 }
             );
 
@@ -80,7 +90,7 @@ public function testGetTestAppArea($annotations, $expectedArea)
         $property = new ReflectionProperty(TestCaseAnnotation::class, 'instance');
         $property->setAccessible(true);
         $property->setValue($this->testCaseAnnotationsMock);
-        $this->testCaseAnnotationsMock->expects($this->once())->method('getAnnotations')->willReturn($annotations);
+        $this->testCaseAnnotationsMock->method('getAnnotations')->willReturn($annotations);
         $this->_applicationMock->expects($this->any())->method('getArea')->willReturn(null);
         $this->_applicationMock->expects($this->once())->method('reinitialize');
         $this->_applicationMock->expects($this->once())->method('loadArea')->with($expectedArea);

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/AppIsolationTest.php

@@ -10,6 +10,7 @@
 namespace Magento\Test\Annotation;
 
 use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Fixture\Parser\AppIsolation;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\MockObject\MockObject;
 
@@ -33,10 +34,19 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
+        $sharedInstances = [
+            AppIsolation::class => $this->createConfiguredMock(AppIsolation::class, ['parse' => []])
+        ];
+        $objectManager->method('get')
+            ->willReturnCallback(
+                function (string $type) use ($sharedInstances) {
+                    return $sharedInstances[$type] ?? new $type();
+                }
+            );
         $objectManager->method('create')
             ->willReturnCallback(
-                function (string $type) {
-                    return $this->createMock($type);
+                function (string $type, array $arguments = []){
+                    return new $type(...array_values($arguments));
                 }
             );
         Bootstrap::setObjectManager($objectManager);

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/ComponentRegistrarFixtureTest.php

@@ -7,7 +7,11 @@
 namespace Magento\Test\Annotation;
 
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\ObjectManagerInterface;
 use Magento\TestFramework\Annotation\ComponentRegistrarFixture;
+use Magento\TestFramework\Fixture\Parser\ComponentsDir;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\MockObject\MockObject;
 
 class ComponentRegistrarFixtureTest extends \PHPUnit\Framework\TestCase
 {
@@ -23,6 +27,28 @@ class ComponentRegistrarFixtureTest extends \PHPUnit\Framework\TestCase
 
     protected function setUp(): void
     {
+        /** @var ObjectManagerInterface|MockObject $objectManager */
+        $objectManager = $this->getMockBuilder(ObjectManagerInterface::class)
+            ->onlyMethods(['get', 'create'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
+        $sharedInstances = [
+            ComponentsDir::class => $this->createConfiguredMock(ComponentsDir::class, ['parse' => []])
+        ];
+        $objectManager->method('get')
+            ->willReturnCallback(
+                function (string $type) use ($sharedInstances) {
+                    return $sharedInstances[$type] ?? new $type();
+                }
+            );
+        $objectManager->method('create')
+            ->willReturnCallback(
+                function (string $type, array $arguments = []){
+                    return new $type(...array_values($arguments));
+                }
+            );
+        Bootstrap::setObjectManager($objectManager);
         $this->componentRegistrar = new ComponentRegistrar();
     }
 

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DataFixtureTest.php

@@ -11,7 +11,6 @@
 use Magento\Framework\DataObject;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\TestFramework\Annotation\DataFixture as DataFixtureAnnotation;
 use Magento\TestFramework\Annotation\DataFixtureDataProvider;
 use Magento\TestFramework\Annotation\DataFixtureSetup;
@@ -106,7 +105,6 @@ protected function setUp(): void
             \Magento\TestFramework\Annotation\Parser\DataFixture::class => $annotationParser,
             DataFixtureFactory::class => $dataFixtureFactory,
             DataFixtureSetup::class => new DataFixtureSetup(new Registry(), $dataFixtureFactory),
-            DataFixtureDataProvider::class => new DataFixtureDataProvider(new Json()),
             'MockFixture1' => $this->fixture1,
             'MockFixture2' => $this->fixture2,
             'MockFixture3' => $this->fixture3,

dev/tests/integration/framework/tests/unit/testsuite/Magento/Test/Annotation/DbIsolationTest.php

@@ -6,6 +6,7 @@
 namespace Magento\Test\Annotation;
 
 use Magento\Framework\ObjectManagerInterface;
+use Magento\TestFramework\Fixture\Parser\DbIsolation;
 use Magento\TestFramework\Helper\Bootstrap;
 use PHPUnit\Framework\MockObject\MockObject;
 
@@ -29,15 +30,18 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
-        $objectManager->method('create')
+        $sharedInstances = [
+            DbIsolation::class => $this->createConfiguredMock(DbIsolation::class, ['parse' => []])
+        ];
+        $objectManager->method('get')
             ->willReturnCallback(
-                function (string $type) {
-                    return $this->createMock($type);
+                function (string $type) use ($sharedInstances) {
+                    return $sharedInstances[$type] ?? new $type();
                 }
             );
-        $objectManager->method('get')
+        $objectManager->method('create')
             ->willReturnCallback(
-                function (string $type, array $arguments = []) {
+                function (string $type, array $arguments = []){
                     return new $type(...array_values($arguments));
                 }
             );