diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle] Simplify createPackageDefinition

Browse Source
This commit is contained in:
Kévin Dunglas 2017-02-04 11:29:24 +01:00
parent f0d13f4708
commit 4b81393387
No known key found for this signature in database
GPG Key ID: 4D04EBEF06AAF3A6
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -619,23 +619,14 @@ class FrameworkExtension extends Extension
throw new \LogicException('An asset package cannot have base URLs and base paths.'); throw new \LogicException('An asset package cannot have base URLs and base paths.');
} }
if (!$baseUrls) { $package = new DefinitionDecorator($baseUrls ? 'assets.url_package' : 'assets.path_package');
$package = new DefinitionDecorator('assets.path_package'); $package
return $package
->setPublic(false)
->replaceArgument(0, $basePath)
->replaceArgument(1, $version)
;
}
$package = new DefinitionDecorator('assets.url_package');
return $package
->setPublic(false) ->setPublic(false)
->replaceArgument(0, $baseUrls) ->replaceArgument(0, $baseUrls ?: $basePath)
->replaceArgument(1, $version) ->replaceArgument(1, $version)
; ;
return $package;
} }
private function createVersion(ContainerBuilder $container, $version, $format, $name) private function createVersion(ContainerBuilder $container, $version, $format, $name)