fix: getting class loader, fixes #51

FriendsOfShopware · Feb 22, 2023 · 12fd281 · 12fd281
1 parent ab570a0
commit 12fd281
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/Component/Generator/Definition/EntityLoader.php b/src/Component/Generator/Definition/EntityLoader.php
@@ -11,6 +11,7 @@
 use PhpParser\NodeFinder;
 use PhpParser\ParserFactory;
 use Shopware\Core\Framework\DataAbstractionLayer\DefinitionInstanceRegistry;
+use Shopware\Core\Kernel;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -25,9 +26,12 @@ class EntityLoader
      */
     private $instanceRegistry;
 
-    public function __construct(DefinitionInstanceRegistry $instanceRegistry)
+    private Kernel $kernel;
+
+    public function __construct(DefinitionInstanceRegistry $instanceRegistry, Kernel $kernel)
     {
         $this->instanceRegistry = $instanceRegistry;
+        $this->kernel = $kernel;
     }
 
     public function load(string $class, SymfonyStyle $io): Definition
@@ -194,8 +198,7 @@ private function normalizeName(string $class): string
 
     private function getNewEntityFolder(string $namespace): string
     {
-        global $classLoader;
-        $prefixes = $classLoader->getPrefixesPsr4();
+        $prefixes = $this->kernel->getPluginLoader()->getClassLoader()->getPrefixesPsr4();
 
         $namespaceSplit = explode('\\', $namespace);
         unset($namespaceSplit[count($namespaceSplit)  -1 ]);

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -15,6 +15,8 @@
         <defaults>
         </defaults>
 
+        <service id="Shopware\Core\Kernel" alias="kernel"/>
+
         <instanceof id="Frosh\DevelopmentHelper\Component\Generator\QuestionHandler\QuestionHandlerInterface">
             <tag name="frosh_development_helper.question_helper"/>
         </instanceof>