NTR: fix fixtures

makefile

@@ -21,6 +21,8 @@ prod: ## Installs all production dependencies
 	# also install shopware in here -> we just need it for the release composer.json file
 	# so just switch to our dev dependency variant
 	php switch-composer.php dev
+	# since we changed composer autoload, we need to refresh the plugin list so autoload section is updated in db
+	cd ../../.. && php bin/console --no-debug plugin:refresh
 	# ----------------------------------------------------------------
 	@composer validate
 	@composer install --no-dev
@@ -29,6 +31,7 @@ prod: ## Installs all production dependencies
 
 dev: ## Installs all dev dependencies
 	php switch-composer.php dev
+	cd ../../.. && php bin/console --no-debug plugin:refresh
 	@composer validate
     # we have to run update in dev mode, because dev dependencies are not compatible with newer php version. should be updated when support for 6.4 is dropped
 	@composer update

src/Compatibility/DependencyLoader.php

@@ -58,13 +58,6 @@ public function loadServices(): void
             $dirFixtures = (string)realpath(__DIR__ . '/../../tests/Fixtures/');
 
             if (is_dir($dirFixtures)) {
-                # 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);
-
-                $classLoader->register();
-
                 $loader->load('services/fixtures/fixtures.xml');
             }
         }

switch-composer.php

@@ -36,6 +36,8 @@ 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;
 }
 
@@ -54,5 +56,6 @@ 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;
 }