bug symfony#30007 [FrameworkBundle] Support use of hyphen in asset package name (damaya, XuruDragon)

fabpot · fabpot · commit c95fdbd0744d · 2019-01-29T06:58:16.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] Support use of hyphen in asset package name This PR is a continuity of symfony#28128 | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#29122 | License | MIT | Doc PR | n/a According to issue symfony/symfony-docs#10442, we tested in a demo bundle, for example in src/AppBundle/Resources/config/config.yml a package using hyphens: app-client-frontend, and withouth the patch it fails because the package is not recognized. With the patch, it works as expected. ```yaml framework: assets: packages: app-client-frontend: version: "%env(FRONTEND_VERSION)%" version_format: '%%2$s/dist/%%1$s' base_urls: - "%env(FRONTEND_URL)%" ``` Commits ------- 5c58b6e Add PackageNameTest to ConfigurationTest also add in the changelog the corresponding entry to this PR 30b6a4f Support use of hyphen in asset package name
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -642,6 +642,7 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode)
                     ->fixXmlConfig('package')
                     ->children()
                         ->arrayNode('packages')
+                            ->normalizeKeys(false)
                             ->useAttributeAsKey('name')
                             ->prototype('array')
                                 ->fixXmlConfig('base_url')
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -211,6 +211,35 @@ public function testAssetsCanBeEnabled()
         $this->assertEquals($defaultConfig, $config['assets']);
     }
 
+    /**
+     * @dataProvider provideValidAssetsPackageNameConfigurationTests
+     */
+    public function testValidAssetsPackageNameConfiguration($packageName)
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(true);
+        $config = $processor->processConfiguration($configuration, [
+            [
+                'assets' => [
+                    'packages' => [
+                        $packageName => [],
+                    ],
+                ],
+            ],
+        ]);
+
+        $this->assertArrayHasKey($packageName, $config['assets']['packages']);
+    }
+
+    public function provideValidAssetsPackageNameConfigurationTests()
+    {
+        return [
+            ['foobar'],
+            ['foo-bar'],
+            ['foo_bar'],
+        ];
+    }
+
     /**
      * @dataProvider provideInvalidAssetConfigurationTests
      */
