33294: Eliminated singleton usage

Author: bohdan-harniuk

dev/tests/unit/Magento/FunctionalTestFramework/Allure/AllureHelperTest.php

@@ -9,6 +9,7 @@
 
 use Magento\FunctionalTestingFramework\Allure\AllureHelper;
 use Magento\FunctionalTestingFramework\Allure\Event\AddUniqueAttachmentEvent;
+use Magento\FunctionalTestingFramework\ObjectManager;
 use PHPUnit\Framework\TestCase;
 use ReflectionProperty;
 use Yandex\Allure\Adapter\Allure;
@@ -21,19 +22,6 @@ class AllureHelperTest extends TestCase
 {
     private const MOCK_FILENAME = 'filename';
 
-    /**
-     * Clear Allure Lifecycle.
-     *
-     * @return void
-     */
-    protected function tearDown(): void
-    {
-        Allure::setDefaultLifecycle();
-        $instanceProperty = new ReflectionProperty(AddUniqueAttachmentEvent::class, 'instance');
-        $instanceProperty->setAccessible(true);
-        $instanceProperty->setValue(null);
-    }
-
     /**
      * The AddAttachmentToStep should add an attachment to the current step.
      *
@@ -121,6 +109,20 @@ public function testAddAttachmentUniqueName(): void
         $this->assertNotEquals($attachmentOne, $attachmentTwo);
     }
 
+    /**
+     * Clear Allure Lifecycle.
+     *
+     * @return void
+     */
+    protected function tearDown(): void
+    {
+        Allure::setDefaultLifecycle();
+
+        $objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
+        $objectManagerProperty->setAccessible(true);
+        $objectManagerProperty->setValue(null);
+    }
+
     /**
      * Mock entire attachment writing mechanisms.
      *
@@ -141,8 +143,23 @@ private function mockAttachmentWriteEvent(string $filePathOrContents, string $ca
             ->method('getAttachmentFileName')
             ->willReturn(self::MOCK_FILENAME);
 
-        $instanceProperty = new ReflectionProperty(AddUniqueAttachmentEvent::class, 'instance');
-        $instanceProperty->setAccessible(true);
-        $instanceProperty->setValue($mockInstance, $mockInstance);
+        $objectManagerMockInstance = $this->createMock(ObjectManager::class);
+        $objectManagerMockInstance
+            ->method('create')
+            ->will(
+                $this->returnCallback(
+                    function (string $class) use ($mockInstance) {
+                        if ($class === AddUniqueAttachmentEvent::class) {
+                            return $mockInstance;
+                        }
+
+                        return null;
+                    }
+                )
+            );
+
+        $objectManagerProperty = new ReflectionProperty(ObjectManager::class, 'instance');
+        $objectManagerProperty->setAccessible(true);
+        $objectManagerProperty->setValue($objectManagerMockInstance, $objectManagerMockInstance);
     }
 }

src/Magento/FunctionalTestingFramework/Allure/AllureHelper.php

@@ -8,6 +8,7 @@
 namespace Magento\FunctionalTestingFramework\Allure;
 
 use Magento\FunctionalTestingFramework\Allure\Event\AddUniqueAttachmentEvent;
+use Magento\FunctionalTestingFramework\ObjectManagerFactory;
 use Yandex\Allure\Adapter\Allure;
 use Yandex\Allure\Adapter\AllureException;
 
@@ -24,7 +25,15 @@ class AllureHelper
      */
     public static function addAttachmentToCurrentStep($data, $caption): void
     {
-        Allure::lifecycle()->fire(AddUniqueAttachmentEvent::getInstance($data, $caption));
+        /** @var AddUniqueAttachmentEvent $event */
+        $event = ObjectManagerFactory::getObjectManager()->create(
+            AddUniqueAttachmentEvent::class,
+            [
+                'filePathOrContents' => $data,
+                'caption' => $caption
+            ]
+        );
+        Allure::lifecycle()->fire($event);
     }
 
     /**
@@ -45,8 +54,15 @@ public static function addAttachmentToLastStep($data, $caption): void
             // Nothing to attach to; do not fire off allure event
             return;
         }
-        
-        $attachmentEvent = AddUniqueAttachmentEvent::getInstance($data, $caption);
+
+        /** @var AddUniqueAttachmentEvent $attachmentEvent */
+        $attachmentEvent = ObjectManagerFactory::getObjectManager()->create(
+            AddUniqueAttachmentEvent::class,
+            [
+                'filePathOrContents' => $data,
+                'caption' => $caption
+            ]
+        );
         $attachmentEvent->process($trueLastStep);
     }
 }

src/Magento/FunctionalTestingFramework/Allure/Event/AddUniqueAttachmentEvent.php

@@ -18,11 +18,6 @@ class AddUniqueAttachmentEvent extends AddAttachmentEvent
     private const DEFAULT_FILE_EXTENSION = 'txt';
     private const DEFAULT_MIME_TYPE = 'text/plain';
 
-    /**
-     * @var AddUniqueAttachmentEvent|null
-     */
-    private static $instance;
-
     /**
      * Near copy of parent function, added uniqid call for filename to prevent buggy allure behavior.
      *
@@ -58,30 +53,6 @@ public function getAttachmentFileName($filePathOrContents, $type): string
         return $this->getOutputFileName($fileSha1, $fileExtension);
     }
 
-    /**
-     * Unit test helper function.
-     *
-     * @param mixed       $filePathOrContents
-     * @param string      $caption
-     * @param string|null $type
-     *
-     * @return AddUniqueAttachmentEvent
-     */
-    public static function getInstance(
-        $filePathOrContents,
-        string $caption,
-        ?string $type = null
-    ): AddUniqueAttachmentEvent {
-        if (!self::$instance) {
-            self::$instance = new AddUniqueAttachmentEvent(
-                $filePathOrContents,
-                $caption,
-                $type
-            );
-        }
-        return self::$instance;
-    }
-
     /**
      * Copies file from one path to another. Wrapper for mocking in unit test.
      *