Refactored component mapping registering

lrlopez · lrlopez · commit f6dd6358c044 · 2017-10-05T10:52:25.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1387,26 +1387,31 @@ private function registerValidatorMapping(ContainerBuilder $container, array $co
             $fileRecorder('xml', dirname($reflClass->getFileName()).'/Resources/config/validation.xml');
         }
 
+        $this->registerComponentMapping($container, $fileRecorder, 'validation');
+
+        $this->registerMappingFilesFromConfig($container, $config, $fileRecorder);
+    }
+
+    private function registerComponentMapping(ContainerBuilder $container, $fileRecorder, $component)
+    {
         foreach ($container->getParameter('kernel.bundles_metadata') as $bundle) {
             $dirname = $bundle['path'];
 
             if (
-                $container->fileExists($file = $dirname.'/Resources/config/validation.yaml', false) ||
-                $container->fileExists($file = $dirname.'/Resources/config/validation.yml', false)
+                $container->fileExists($file = $dirname . '/Resources/config/'.$component.'.yaml', false) ||
+                $container->fileExists($file = $dirname . '/Resources/config/'.$component.'.yml', false)
             ) {
                 $fileRecorder('yml', $file);
             }
 
-            if ($container->fileExists($file = $dirname.'/Resources/config/validation.xml', false)) {
+            if ($container->fileExists($file = $dirname . '/Resources/config/'.$component.'.xml', false)) {
                 $fileRecorder('xml', $file);
             }
 
-            if ($container->fileExists($dir = $dirname.'/Resources/config/validation', '/^$/')) {
+            if ($container->fileExists($dir = $dirname . '/Resources/config/'.$component, '/^$/')) {
                 $this->registerMappingFilesFromDir($dir, $fileRecorder);
             }
         }
-
-        $this->registerMappingFilesFromConfig($container, $config, $fileRecorder);
     }
 
     private function registerMappingFilesFromDir($dir, callable $fileRecorder)

Original file line number	Diff line number	Diff line change
`@@ -1387,26 +1387,31 @@ private function registerValidatorMapping(ContainerBuilder $container, array $co`
`1387`	`1387`	`$fileRecorder('xml', dirname($reflClass->getFileName()).'/Resources/config/validation.xml');`
`1388`	`1388`	`}`
`1389`	`1389`
	`1390`	`+ $this->registerComponentMapping($container, $fileRecorder, 'validation');`
	`1391`	`+`
	`1392`	`+ $this->registerMappingFilesFromConfig($container, $config, $fileRecorder);`
	`1393`	`+ }`
	`1394`	`+`
	`1395`	`+ private function registerComponentMapping(ContainerBuilder $container, $fileRecorder, $component)`
	`1396`	`+ {`
`1390`	`1397`	`foreach ($container->getParameter('kernel.bundles_metadata') as $bundle) {`
`1391`	`1398`	`$dirname = $bundle['path'];`
`1392`	`1399`
`1393`	`1400`	`if (`
`1394`		`- $container->fileExists($file = $dirname.'/Resources/config/validation.yaml', false) \|\|`
`1395`		`- $container->fileExists($file = $dirname.'/Resources/config/validation.yml', false)`
	`1401`	`+ $container->fileExists($file = $dirname . '/Resources/config/'.$component.'.yaml', false) \|\|`
	`1402`	`+ $container->fileExists($file = $dirname . '/Resources/config/'.$component.'.yml', false)`
`1396`	`1403`	`) {`
`1397`	`1404`	`$fileRecorder('yml', $file);`
`1398`	`1405`	`}`
`1399`	`1406`
`1400`		`- if ($container->fileExists($file = $dirname.'/Resources/config/validation.xml', false)) {`
	`1407`	`+ if ($container->fileExists($file = $dirname . '/Resources/config/'.$component.'.xml', false)) {`
`1401`	`1408`	`$fileRecorder('xml', $file);`
`1402`	`1409`	`}`
`1403`	`1410`
`1404`		`- if ($container->fileExists($dir = $dirname.'/Resources/config/validation', '/^$/')) {`
	`1411`	`+ if ($container->fileExists($dir = $dirname . '/Resources/config/'.$component, '/^$/')) {`
`1405`	`1412`	`$this->registerMappingFilesFromDir($dir, $fileRecorder);`
`1406`	`1413`	`}`
`1407`	`1414`	`}`
`1408`		`-`
`1409`		`- $this->registerMappingFilesFromConfig($container, $config, $fileRecorder);`
`1410`	`1415`	`}`
`1411`	`1416`
`1412`	`1417`	`private function registerMappingFilesFromDir($dir, callable $fileRecorder)`