Fix error caused by non-existing gedmo doctrine mapping directory (#26)

* Fix error caused by non-existing gedmo doctrine mapping directory * Fix phpstan
sulu · Mar 4, 2021 · 9818b4d · 9818b4d
1 parent 3170aa0
commit 9818b4d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/DependencyInjection/CompilerPass/ImageFormatCompilerPass.php b/DependencyInjection/CompilerPass/ImageFormatCompilerPass.php
@@ -27,7 +27,10 @@ protected function getFiles(ContainerBuilder $container)
     {
         /** @var ThemeRepositoryInterface $themeRepository */
         $themeRepository = $container->get('sylius.repository.theme');
+
+        /** @var array<class-string> $bundles */
         $bundles = $container->getParameter('kernel.bundles');
+
         $configPath = 'config/image-formats.xml';
 
         $files = [];

diff --git a/DependencyInjection/SuluThemeExtension.php b/DependencyInjection/SuluThemeExtension.php
@@ -29,6 +29,10 @@ class SuluThemeExtension extends Extension
     public function load(array $configs, ContainerBuilder $container): void
     {
         $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
-        $loader->load(sprintf('%s.xml', $container->getParameter('sulu.context')));
+
+        /** @var string $context */
+        $context = $container->getParameter('sulu.context');
+
+        $loader->load(sprintf('%s.xml', $context));
     }
 }
diff --git a/Tests/Application/Kernel.php b/Tests/Application/Kernel.php
@@ -49,4 +49,16 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
 
         $loader->load(__DIR__ . '/config/config_' . $this->getContext() . '.yaml');
     }
+
+    protected function getKernelParameters()
+    {
+        $parameters = parent::getKernelParameters();
+
+        $reflection = new \ReflectionClass(\Gedmo\Exception::class);
+        $gedmoDirectory = \dirname($reflection->getFileName());
+
+        $parameters['gedmo_directory'] = $gedmoDirectory;
+
+        return $parameters;
+    }
 }
diff --git a/Tests/Application/config/config.yaml b/Tests/Application/config/config.yaml
@@ -4,7 +4,7 @@ doctrine:
             gedmo_tree:
                 type: xml
                 prefix: Gedmo\Tree\Entity
-                dir: "%kernel.project_dir%/../../vendor/gedmo/doctrine-extensions/lib/Gedmo/Tree/Entity"
+                dir: "%gedmo_directory%/Tree/Entity"
                 alias: GedmoTree
                 is_bundle: false