NTR: Fix fixtures autoload (#753)

composer.json

@@ -44,8 +44,7 @@
         "psr-4": {
             "Kiener\\MolliePayments\\": "src/",
             "Mollie\\Api\\": "vendor_manual/mollie/mollie-api-php/src/",
-            "Shopware\\Core\\": "polyfill/Shopware/Core/",
-            "MolliePayments\\Fixtures\\": "tests/Fixtures/"
+            "Shopware\\Core\\": "polyfill/Shopware/Core/"
         }
     },
     "autoload-dev": {

src/Compatibility/DependencyLoader.php

@@ -51,16 +51,34 @@ public function loadServices(): void
             $loader->load('compatibility/flowbuilder/6.4.6.0.xml');
         }
 
+        if ($this->shouldLoadFixtures()) {
+            $loader->load('services/fixtures/fixtures.xml');
+        }
+    }
 
-        $composerDevReqsInstalled = file_exists(__DIR__.'/../../vendor/bin/phpunit');
+    public function registerFixturesAutoloader():void
+    {
+        if ($this->shouldLoadFixtures() === false) {
+            return;
+        }
 
-        if ($composerDevReqsInstalled) {
-            $dirFixtures = (string)realpath(__DIR__ . '/../../tests/Fixtures/');
+        $dirFixtures = (string)realpath(__DIR__ . '/../../tests/Fixtures/');
+        # we need to tell Shopware to load our custom fixtures
+        # from our TEST autoload-dev area....
+        $classLoader = new ClassLoader();
+        $classLoader->addPsr4("MolliePayments\\Fixtures\\", $dirFixtures, true);
 
-            if (is_dir($dirFixtures)) {
-                $loader->load('services/fixtures/fixtures.xml');
-            }
+        $classLoader->register();
+    }
+
+    private function shouldLoadFixtures():bool
+    {
+        $composerDevReqsInstalled = file_exists(__DIR__.'/../../vendor/bin/phpunit');
+        if ($composerDevReqsInstalled === false) {
+            return  false;
         }
+        $dirFixtures = (string)realpath(__DIR__ . '/../../tests/Fixtures/');
+        return is_dir($dirFixtures);
     }
 
     /**

src/MolliePayments.php

@@ -103,6 +103,27 @@ public function activate(ActivateContext $context): void
         $this->runDbMigrations($context->getMigrationCollection());
     }
 
+    public function boot(): void
+    {
+        parent::boot();
+
+        if ($this->container === null) {
+            return;
+        }
+        /** @var Container $container */
+        $container = $this->container;
+
+        $shopwareVersion = $container->getParameter('kernel.shopware_version');
+        if (!is_string($shopwareVersion)) {
+            $shopwareVersion = Kernel::SHOPWARE_FALLBACK_VERSION;
+        }
+        # load the dependencies that are compatible
+        # with our current shopware version
+
+        $loader = new DependencyLoader($container, new VersionCompare($shopwareVersion));
+        $loader->registerFixturesAutoloader();
+    }
+
 
     /**
      * @param Context $context

switch-composer.php

@@ -36,8 +36,6 @@ function moveToDev(array $composerContent, string $swVersion)
     unset($composerContent['require']["shopware/administration"]);
     unset($composerContent['require']["shopware/storefront"]);
 
-    $composerContent['autoload']['psr-4']['MolliePayments\\Fixtures\\']  = "tests/Fixtures/";
-
     return $composerContent;
 }
 
@@ -56,6 +54,5 @@ function moveToProd(array $composerContent, string $swVersion)
     unset($composerContent['require-dev']["shopware/administration"]);
     unset($composerContent['require-dev']["shopware/storefront"]);
 
-    unset($composerContent['autoload']['psr-4']['MolliePayments\\Fixtures\\']);
     return $composerContent;
 }