Support modern bundle structure

schmittjoh · Jan 6, 2023 · 6d60950 · 6d60950
1 parent 4b7f6a6
commit 6d60950
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 16 deletions.
diff --git a/DependencyInjection/JMSSerializerExtension.php b/DependencyInjection/JMSSerializerExtension.php
@@ -234,7 +234,7 @@ private function loadInternal(array $config, ScopedContainer $container, array $
             $container->removeDefinition('jms_serializer.cache.cache_warmer');
         }
 
-        $directories = $this->detectMetadataDirectories($config['metadata'], $bundles);
+        $directories = $this->detectMetadataDirectories($config['metadata'], $container->getParameter('kernel.bundles_metadata'));
 
         $container
             ->getDefinition('jms_serializer.metadata.file_locator')
@@ -401,16 +401,13 @@ private function setVisitorOptions(array $config, ScopedContainer $container): v
         }
     }
 
-    private function detectMetadataDirectories($metadata, $bundles): array
+    private function detectMetadataDirectories(array $metadata, array $bundlesMetadata): array
     {
         $directories = [];
         if ($metadata['auto_detection']) {
-            foreach ($bundles as $name => $class) {
-                $ref = new \ReflectionClass($class);
-
-                $dir = dirname($ref->getFileName()) . '/Resources/config/serializer';
-                if (file_exists($dir)) {
-                    $directories[$ref->getNamespaceName()] = $dir;
+            foreach ($bundlesMetadata as $bundle) {
+                if (is_dir($dir = $bundle['path'] . '/Resources/config/serializer') || is_dir($dir = $bundle['path'] . '/config/serializer')) {
+                    $directories[$bundle['namespace']] = $dir;
                 }
             }
         }
@@ -419,15 +416,14 @@ private function detectMetadataDirectories($metadata, $bundles): array
             $directory['path'] = rtrim(str_replace('\\', '/', $directory['path']), '/');
 
             if ('@' === $directory['path'][0]) {
-                $pathParts = explode('/', $directory['path']);
+                $pathParts = explode('/', $directory['path'], 2);
                 $bundleName = substr($pathParts[0], 1);
 
-                if (!isset($bundles[$bundleName])) {
-                    throw new RuntimeException(sprintf('The bundle "%s" has not been registered with AppKernel. Available bundles: %s', $bundleName, implode(', ', array_keys($bundles))));
+                if (!isset($bundlesMetadata[$bundleName])) {
+                    throw new RuntimeException(sprintf('The bundle "%s" has not been registered with AppKernel. Available bundles: %s', $bundleName, implode(', ', array_keys($bundlesMetadata))));
                 }
 
-                $ref = new \ReflectionClass($bundles[$bundleName]);
-                $directory['path'] = dirname($ref->getFileName()) . substr($directory['path'], strlen('@' . $bundleName));
+                $directory['path'] = $bundlesMetadata[$bundleName]['path'] . substr($directory['path'], strlen('@' . $bundleName));
             }
 
             $dir = rtrim($directory['path'], '\\/');

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -16,12 +16,19 @@ class ConfigurationTest extends TestCase
 {
     private function getContainer(array $configs = [])
     {
+        $bundles = ['JMSSerializerBundle' => 'JMS\SerializerBundle\JMSSerializerBundle'];
         $container = new ContainerBuilder();
 
         $container->set('annotation_reader', new AnnotationReader());
         $container->setParameter('kernel.debug', true);
         $container->setParameter('kernel.cache_dir', sys_get_temp_dir() . '/serializer');
-        $container->setParameter('kernel.bundles', ['JMSSerializerBundle' => 'JMS\SerializerBundle\JMSSerializerBundle']);
+        $container->setParameter('kernel.bundles', $bundles);
+        $container->setParameter('kernel.bundles_metadata', array_map(static function (string $class): array {
+            return [
+                'path' => (new $class)->getPath(),
+                'namespace' => (new \ReflectionClass($class))->getNamespaceName(),
+            ];
+        }, $bundles));
 
         $bundle = new JMSSerializerBundle();
 

diff --git a/Tests/DependencyInjection/CustomHandlerPassTest.php b/Tests/DependencyInjection/CustomHandlerPassTest.php
@@ -27,7 +27,7 @@ private function getContainer(array $configs = [])
         $container->setParameter('kernel.debug', true);
         $container->setParameter('kernel.cache_dir', sys_get_temp_dir() . '/serializer');
         $container->setParameter('kernel.bundles', []);
-        $container->setParameter('kernel.bundles', []);
+        $container->setParameter('kernel.bundles_metadata', []);
 
         $loader->load(['jms_serializer' => $configs], $container);
 

diff --git a/Tests/DependencyInjection/DoctrinePassTest.php b/Tests/DependencyInjection/DoctrinePassTest.php
@@ -25,6 +25,7 @@ private function getContainer(array $configs = [])
         $container->setParameter('kernel.debug', true);
         $container->setParameter('kernel.cache_dir', sys_get_temp_dir() . '/serializer');
         $container->setParameter('kernel.bundles', []);
+        $container->setParameter('kernel.bundles_metadata', []);
 
         $pass = new DoctrinePass();
         $container->addCompilerPass($pass);

diff --git a/Tests/DependencyInjection/EventSubscribersAndListenersPassTest.php b/Tests/DependencyInjection/EventSubscribersAndListenersPassTest.php
@@ -27,7 +27,7 @@ private function getContainer(array $configs = [])
         $container->setParameter('kernel.debug', true);
         $container->setParameter('kernel.cache_dir', sys_get_temp_dir() . '/serializer');
         $container->setParameter('kernel.bundles', []);
-        $container->setParameter('kernel.bundles', []);
+        $container->setParameter('kernel.bundles_metadata', []);
 
         $loader->load(['jms_serializer' => $configs], $container);
 

diff --git a/Tests/DependencyInjection/FormErrorHandlerTranslationDomainPassTest.php b/Tests/DependencyInjection/FormErrorHandlerTranslationDomainPassTest.php
@@ -24,6 +24,7 @@ private function getContainer(array $configs = [])
         $container->setParameter('kernel.debug', true);
         $container->setParameter('kernel.cache_dir', sys_get_temp_dir() . '/serializer');
         $container->setParameter('kernel.bundles', []);
+        $container->setParameter('kernel.bundles_metadata', []);
 
         $loader->load(['jms_serializer' => $configs], $container);
 

diff --git a/Tests/DependencyInjection/JMSSerializerExtensionTest.php b/Tests/DependencyInjection/JMSSerializerExtensionTest.php
@@ -793,6 +793,7 @@ private function getContainerForConfigLoad(array $configs, ?callable $configurat
         $container->setParameter('kernel.debug', true);
         $container->setParameter('kernel.cache_dir', sys_get_temp_dir() . '/serializer');
         $container->setParameter('kernel.bundles', []);
+        $container->setParameter('kernel.bundles_metadata', []);
         $container->setParameter('foo', 'bar');
         $container->set('annotation_reader', new AnnotationReader());
         $container->setDefinition('doctrine', new Definition(Registry::class));

diff --git a/Tests/DependencyInjection/NamingStrategyTest.php b/Tests/DependencyInjection/NamingStrategyTest.php
@@ -25,6 +25,7 @@ private function getContainer(array $configs = [])
         $container->setParameter('kernel.debug', true);
         $container->setParameter('kernel.cache_dir', sys_get_temp_dir() . '/serializer');
         $container->setParameter('kernel.bundles', []);
+        $container->setParameter('kernel.bundles_metadata', []);
 
         $loader->load(['jms_serializer' => $configs], $container);
 

diff --git a/Tests/DependencyInjection/TwigExtensionPassTest.php b/Tests/DependencyInjection/TwigExtensionPassTest.php
@@ -23,6 +23,12 @@ private function getContainer(array $bundles = ['TwigBundle' => TwigBundle::clas
         $container->setParameter('kernel.debug', true);
         $container->setParameter('kernel.cache_dir', sys_get_temp_dir() . '/serializer');
         $container->setParameter('kernel.bundles', $bundles);
+        $container->setParameter('kernel.bundles_metadata', array_map(static function (string $class): array {
+            return [
+                'path' => (new $class)->getPath(),
+                'namespace' => (new \ReflectionClass($class))->getNamespaceName(),
+            ];
+        }, $bundles));
 
         $loader->load([[]], $container);