bug #53751 [AssetMapper] Improve import_polyfill configuration error (smnandre)

fabpot · fabpot · commit 2fcd5be182f3 · 2024-02-04T11:02:08.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [AssetMapper] Improve import_polyfill configuration error | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #53725 | License | MIT Add missing error when 'asset_mapper.importmap_polyfill' is set to true (only false and string are allowed) Commits ------- 050fe20 [AssetMapper] Improve import_polyfill configuration error
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -930,6 +930,10 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                         ->end()
                         ->scalarNode('importmap_polyfill')
                             ->info('The importmap name that will be used to load the polyfill. Set to false to disable.')
+                            ->validate()
+                                ->ifTrue()
+                                ->thenInvalid('Invalid "importmap_polyfill" value. Must be either an importmap name or false.')
+                            ->end()
                             ->defaultValue('es-module-shims')
                         ->end()
                         ->arrayNode('importmap_script_attributes')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -143,6 +143,42 @@ public function testAssetMapperCanBeEnabled()
         $this->assertEquals($defaultConfig, $config['asset_mapper']);
     }
 
+    /**
+     * @dataProvider provideImportmapPolyfillTests
+     */
+    public function testAssetMapperPolyfillValue(mixed $polyfillValue, bool $isValid, mixed $expected)
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+
+        if (!$isValid) {
+            $this->expectException(InvalidConfigurationException::class);
+            $this->expectExceptionMessage($expected);
+        }
+
+        $config = $processor->processConfiguration($configuration, [[
+            'http_method_override' => false,
+            'handle_all_throwables' => true,
+            'php_errors' => ['log' => true],
+            'asset_mapper' => null === $polyfillValue ? [] : [
+                'importmap_polyfill' => $polyfillValue,
+            ],
+        ]]);
+
+        if ($isValid) {
+            $this->assertEquals($expected, $config['asset_mapper']['importmap_polyfill']);
+        }
+    }
+
+    public static function provideImportmapPolyfillTests()
+    {
+        yield [true, false, 'Must be either an importmap name or false.'];
+        yield [null, true, 'es-module-shims'];
+        yield ['es-module-shims', true, 'es-module-shims'];
+        yield ['foo', true, 'foo'];
+        yield [false, true, false];
+    }
+
     /**
      * @dataProvider provideValidAssetsPackageNameConfigurationTests
      */
