bug #53582 [TwigBundle] Fix configuration when "paths" is null (smnandre)

fabpot · fabpot · commit c7bafc2d9c1d · 2024-01-19T08:53:15.000+01:00
This PR was merged into the 5.4 branch. Discussion ---------- [TwigBundle] Fix configuration when "paths" is null | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | .. | License | MIT TwigBundle configuration throws an error when paths config is empty (found it while commenting a line) ```yaml twig: default_path: '%kernel.project_dir%/templates' form_themes: - 'form/form_theme.html.twig' paths: # '%kernel.project_dir%/templates/foo': Bar ``` ```console In Configuration.php line 159: [ErrorException] Warning: foreach() argument must be of type array|object, null given Exception trace: ``` Triggered by this line ```diff ->arrayNode('paths') ->normalizeKeys(false) ->useAttributeAsKey('paths') ->beforeNormalization() ->always() ->then(function ($paths) { $normalized = []; - foreach ($paths as $path => $namespace) { if (\is_array($namespace)) { // xml $path = $namespace['value']; $namespace = $namespace['namespace']; } ``` This PR replace `always` with `isArray` and add a test Commits ------- c72236b [TwigBundle] Fix configuration when 'paths' is null
diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
@@ -147,7 +147,7 @@ private function addTwigOptions(ArrayNodeDefinition $rootNode)
                     ->normalizeKeys(false)
                     ->useAttributeAsKey('paths')
                     ->beforeNormalization()
-                        ->always()
+                        ->ifArray()
                         ->then(function ($paths) {
                             $normalized = [];
                             foreach ($paths as $path => $namespace) {
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -52,4 +52,16 @@ public function testArrayKeysInGlobalsAreNotNormalized()
 
         $this->assertSame(['global' => ['value' => ['some-key' => 'some-value']]], $config['globals']);
     }
+
+    public function testNullPathsAreConvertedToIterable()
+    {
+        $input = [
+            'paths' => null,
+        ];
+
+        $processor = new Processor();
+        $config = $processor->processConfiguration(new Configuration(), [$input]);
+
+        $this->assertSame([], $config['paths']);
+    }
 }
