Some more fixes

dunglas · dunglas · commit 7da52587f47e · 2017-02-04T11:38:22.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -797,15 +797,23 @@ private function createPackageDefinition($basePath, array $baseUrls, Reference $
             throw new \LogicException('An asset package cannot have base URLs and base paths.');
         }
 
-        $package = new ChildDefinition($baseUrls ? 'assets.url_package' : 'assets.path_package');
+        if (!$baseUrls) {
+            $package = new ChildDefinition('assets.path_package');
 
-        $package
+            return $package
+                ->setPublic(false)
+                ->replaceArgument(0, $basePath)
+                ->replaceArgument(1, $version)
+            ;
+        }
+
+        $package = new ChildDefinition('assets.url_package');
+
+        return $package
             ->setPublic(false)
-            ->replaceArgument(0, $baseUrls ?: $basePath)
+            ->replaceArgument(0, $baseUrls)
             ->replaceArgument(1, $version)
         ;
-
-        return $package;
     }
 
     private function createVersion(ContainerBuilder $container, $version, $format, $name)
diff --git a/src/Symfony/Component/Asset/composer.json b/src/Symfony/Component/Asset/composer.json
@@ -19,10 +19,12 @@
         "php": ">=5.5.9"
     },
     "suggest": {
-        "symfony/http-foundation": ""
+        "symfony/http-foundation": "",
+        "symfony/http-kernel": ""
     },
     "require-dev": {
-        "symfony/http-foundation": "~2.8|~3.0"
+        "symfony/http-foundation": "~2.8|~3.0",
+        "symfony/http-kernel": "~2.8|~3.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Asset\\": "" },
