[Maintenance] Refactor test app config

Sylius · Nov 2, 2022 · 2254fef · 2254fef
1 parent 2048ec2
commit 2254fef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/tests/Application/Kernel.php b/tests/Application/Kernel.php
@@ -100,18 +100,6 @@ private function registerBundlesFromFile(string $bundlesFile): iterable
     {
         $contents = require $bundlesFile;
 
-        if (SyliusKernel::MINOR_VERSION > 11) {
-            $contents = array_merge(
-                ['League\FlysystemBundle\FlysystemBundle' => ['all' => true]],
-                $contents,
-            );
-        } else {
-            $contents = array_merge(
-                ['Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle' => ['all' => true]],
-                $contents,
-            );
-        }
-
         foreach ($contents as $class => $envs) {
             if (isset($envs['all']) || isset($envs[$this->environment])) {
                 yield new $class();

diff --git a/tests/Application/config/bundles.php b/tests/Application/config/bundles.php
@@ -1,6 +1,8 @@
 <?php
 
-return [
+use Sylius\Bundle\CoreBundle\Application\Kernel as SyliusKernel;
+
+$bundles = [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
@@ -58,3 +60,11 @@
     SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
     Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
 ];
+
+if (SyliusKernel::MINOR_VERSION > 11) {
+    $bundles[League\FlysystemBundle\FlysystemBundle::class] = ['all' => true];
+} else {
+    $bundles[Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class] = ['all' => true];
+}
+
+return $bundles;