Commiteba8ffc

committed

Some more fixes

1 parent59f3b3e commiteba8ffcCopy full SHA for eba8ffc

File tree

+17

-7

lines changed

src/Symfony
- Bundle/FrameworkBundle/DependencyInjection
  - FrameworkExtension.php
- Component/Asset
  - composer.json

+17

-7

lines changed

Lines changed: 13 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -797,15 +797,23 @@ private function createPackageDefinition($basePath, array $baseUrls, Reference $`
`797`	`797`	`thrownew \LogicException('An asset package cannot have base URLs and base paths.');`
`798`	`798`	`}`
`799`	`799`
`800`		`-$package =newChildDefinition($baseUrls ?'assets.url_package' :'assets.path_package');`
	`800`	`+if (!$baseUrls) {`
	`801`	`+$package =newChildDefinition('assets.path_package');`
`801`	`802`
`802`		`-$package`
	`803`	`+return$package`
	`804`	`+ ->setPublic(false)`
	`805`	`+ ->replaceArgument(0,$basePath)`
	`806`	`+ ->replaceArgument(1,$version)`
	`807`	`+ ;`
	`808`	`+ }`
	`809`	`+`
	`810`	`+$package =newChildDefinition('assets.url_package');`
	`811`	`+`
	`812`	`+return$package`
`803`	`813`	`->setPublic(false)`
`804`		`- ->replaceArgument(0,$baseUrls ?:$basePath)`
	`814`	`+ ->replaceArgument(0,$baseUrls)`
`805`	`815`	`->replaceArgument(1,$version)`
`806`	`816`	`;`
`807`		`-`
`808`		`-return$package;`
`809`	`817`	`}`
`810`	`818`
`811`	`819`	`privatefunctioncreateVersion(ContainerBuilder$container,$version,$format,$name)`

Lines changed: 4 additions & 2 deletions

Comments

(0)