From 83a72a03be0437c5ce6fb1bd17b4b3881238e003 Mon Sep 17 00:00:00 2001 From: damaya Date: Fri, 3 Aug 2018 17:44:03 -0500 Subject: [PATCH 1/2] Update Configuration.php Support for using hyphens on yaml config for packages names, according to issue https://github.com/symfony/symfony/issues/28122#issuecomment-410339787 --- .../FrameworkBundle/DependencyInjection/Configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index 176636625214..87d9dd1cf985 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -631,7 +631,7 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode) ->end() ->fixXmlConfig('package') ->children() - ->arrayNode('packages') + ->arrayNode('packages')->normalizeKeys(false) ->useAttributeAsKey('name') ->prototype('array') ->fixXmlConfig('base_url') From 8fd99e219e469c05b3d992b90debb3449e3e79f0 Mon Sep 17 00:00:00 2001 From: damaya Date: Wed, 10 Oct 2018 12:47:22 -0500 Subject: [PATCH 2/2] #28122 Support use of hyphen in asset package name | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes (Manual tests only) | Fixed tickets | #28122 | License | MIT | Doc PR | n/a According to issue https://github.com/symfony/symfony-docs/pull/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. ``` framework: assets: packages: app-client-frontend: version: "%env(FRONTEND_VERSION)%" version_format: '%%2$s/dist/%%1$s' base_urls: - "%env(FRONTEND_URL)%" ``` --- .../FrameworkBundle/DependencyInjection/Configuration.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php index 87d9dd1cf985..6d669811fc7f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php @@ -631,7 +631,8 @@ private function addAssetsSection(ArrayNodeDefinition $rootNode) ->end() ->fixXmlConfig('package') ->children() - ->arrayNode('packages')->normalizeKeys(false) + ->arrayNode('packages') + ->normalizeKeys(false) ->useAttributeAsKey('name') ->prototype('array') ->fixXmlConfig('base_url')