Better workaround for TestSetter

ho-nl · Nov 17, 2020 · 4ee30cb · 4ee30cb
1 parent 3a871f9
commit 4ee30cb
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/framework/ReachDigital/TestFramework/Bootstrap/DocBlock.php b/framework/ReachDigital/TestFramework/Bootstrap/DocBlock.php
@@ -17,6 +17,13 @@ protected function _getSubscribers(\Magento\TestFramework\Application $applicati
 //            new \Magento\TestFramework\Workaround\Cleanup\StaticProperties(),
             new \Magento\TestFramework\Isolation\WorkingDirectory(),
             new \Magento\TestFramework\Isolation\DeploymentConfig(),
+        ];
+
+        if (class_exists(\Magento\TestFramework\Workaround\Override\Fixture\Resolver\TestSetter::class)) {
+            $subscribers[] = new \Magento\TestFramework\Workaround\Override\Fixture\Resolver\TestSetter();
+        }
+
+        $subscribers = array_merge($subscribers, [
             new \ReachDigital\TestFramework\Annotation\AppIsolation($application),
             new \Magento\TestFramework\Annotation\IndexerDimensionMode($application),
             new \Magento\TestFramework\Isolation\AppConfig(),
@@ -35,11 +42,7 @@ protected function _getSubscribers(\Magento\TestFramework\Application $applicati
             new \Magento\TestFramework\Annotation\Cache($application),
             new \Magento\TestFramework\Annotation\AdminConfigFixture(),
             new \Magento\TestFramework\Annotation\ConfigFixture(),
-        ];
-
-        if (class_exists(\Magento\TestFramework\Workaround\Override\Fixture\Resolver\TestSetter::class)) {
-            $subscribers[] = new \Magento\TestFramework\Workaround\Override\Fixture\Resolver\TestSetter();
-        }
+        ]);
 
         return $subscribers;
     }