33308: Code refactoring

Author: bohdan-harniuk

dev/tests/unit/Magento/FunctionalTestFramework/Util/ModuleResolverTest.php

@@ -37,6 +37,14 @@ protected function setUp(): void
     public static function tearDownAfterClass(): void
     {
         TestLoggingUtil::getInstance()->clearMockLoggingUtil();
+        
+        $moduleResolverServiceInstance = new ReflectionProperty(ModuleResolverService::class, 'INSTANCE');
+        $moduleResolverServiceInstance->setAccessible(true);
+        $moduleResolverServiceInstance->setValue(null);
+
+        $mftfAppConfigInstance = new ReflectionProperty(MftfApplicationConfig::class, 'MFTF_APPLICATION_CONTEXT');
+        $mftfAppConfigInstance->setAccessible(true);
+        $mftfAppConfigInstance->setValue(null);
     }
 
     /**
@@ -48,8 +56,8 @@ public static function tearDownAfterClass(): void
     public function testGetModulePathsAlreadySet(): void
     {
         $resolver = ModuleResolver::getInstance();
-        $this->setMockResolverProperties($resolver, ["example" . DIRECTORY_SEPARATOR . "paths"]);
-        $this->assertEquals(["example" . DIRECTORY_SEPARATOR . "paths"], $resolver->getModulesPath());
+        $this->setMockResolverProperties($resolver, ['example' . DIRECTORY_SEPARATOR . 'paths']);
+        $this->assertEquals(['example' . DIRECTORY_SEPARATOR . 'paths'], $resolver->getModulesPath());
     }
 
     /**
@@ -68,15 +76,15 @@ public function testGetModulePathsAggregate(): void
             ->willReturn(
                 [
                     'Magento_example' => 'some' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'example',
-                    'Magento_sample' => 'other' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'sample',
+                    'Magento_sample' => 'other' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'sample'
                 ]
             );
         $moduleResolverService->expects($this->any())
             ->method('aggregateTestModulePaths')
             ->willReturn(
                 [
                     'some' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'example' => ['example'],
-                    'other' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'sample' => ['sample'],
+                    'other' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'sample' => ['sample']
                 ]
             );
 
@@ -116,7 +124,7 @@ public function testAggregateTestModulePathsFromComposerJson(): void
                         [
                             'Magento_ModuleB',
                             'Magento_ModuleC'
-                        ],
+                        ]
                 ]
             );
 
@@ -154,7 +162,7 @@ public function testAggregateTestModulePathsFromComposerInstaller(): void
                         [
                             'Magento_ModuleB',
                             'Magento_ModuleC'
-                        ],
+                        ]
                 ]
             );
 
@@ -243,7 +251,7 @@ public function testMergeFlipAndFilterModulePathsNoForceGenerate(): void
                 4 => 'Magento_ModuleB',
                 5 => 'Magento_ModuleD',
                 6 => 'Magento_Otherexample',
-                7 => 'Magento_ModuleC',
+                7 => 'Magento_ModuleC'
             ]
         );
         $this->assertEquals(
@@ -254,7 +262,7 @@ public function testMergeFlipAndFilterModulePathsNoForceGenerate(): void
                 'some' . DIRECTORY_SEPARATOR . 'path' . DIRECTORY_SEPARATOR . 'example',
                 'composer' . DIRECTORY_SEPARATOR . 'json' . DIRECTORY_SEPARATOR . 'pathB',
                 'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'pathD',
-                'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'pathC',
+                'composer' . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . 'pathC'
 
             ],
             $resolver->getModulesPath()
@@ -284,7 +292,7 @@ public function testMergeFlipNoSortModulePathsNoForceGenerate(): void
                     . 'Magento' . DIRECTORY_SEPARATOR . 'ModuleBC' =>
                         [
                             'Magento_ModuleB',
-                            'Magento_ModuleC',
+                            'Magento_ModuleC'
                         ]
                 ]
             );
@@ -363,7 +371,7 @@ public function testMergeFlipAndSortModulePathsForceGenerate(): void
                     . 'Magento' . DIRECTORY_SEPARATOR . 'ModuleBC' =>
                         [
                             'Magento_ModuleB',
-                            'Magento_ModuleC',
+                            'Magento_ModuleC'
                         ]
                 ]
             );
@@ -670,7 +678,7 @@ protected function tearDown(): void
     {
         // re set env
         if (!isset($_ENV['MAGENTO_ADMIN_USERNAME'])) {
-            $_ENV['MAGENTO_ADMIN_USERNAME'] = "admin";
+            $_ENV['MAGENTO_ADMIN_USERNAME'] = 'admin';
         }
     }
 }

src/Magento/FunctionalTestingFramework/Util/ModuleResolver/ModuleResolverService.php

@@ -53,7 +53,7 @@ private function __construct()
     public static function getInstance()
     {
         if (self::$INSTANCE === null) {
-            return new self();
+            self::$INSTANCE = new ModuleResolverService();
         }
 
         return self::$INSTANCE;