[FrameworkBundle] Enable assets by default.

jakzal · jakzal · commit 3808735bfaa9 · 2015-02-12T23:00:14.000Z
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -53,6 +53,14 @@ public function getConfigTreeBuilder()
                     return $v;
                 })
             ->end()
+            ->beforeNormalization()
+                ->ifTrue(function ($v) { return !isset($v['templating']) && !isset($v['assets']); })
+                ->then(function ($v) {
+                    $v['assets'] = null;
+
+                    return $v;
+                })
+            ->end()
             ->validate()
                 ->ifTrue(function ($v) { return isset($v['templating']); })
                 ->then(function ($v) {
@@ -65,7 +73,7 @@ public function getConfigTreeBuilder()
 
                         // convert the old configuration to the new one
                         if (isset($v['assets'])) {
-                            throw new LogicException('You cannot use assets settings under "templating.templating" and "assets" configurations in the same project.');
+                            throw new \LogicException('You cannot use assets settings under "templating.templating" and "assets" configurations in the same project.');
                         }
 
                         $v['assets'] = array(
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -145,6 +145,13 @@ protected static function getBundleDefaultConfig()
                 'magic_call' => false,
                 'throw_exception_on_invalid_index' => false,
             ),
+            'assets' => array(
+                'version' => null,
+                'version_format' => '%%s?%%s',
+                'base_path' => '',
+                'base_urls' => array(),
+                'packages' => array(),
+            ),
         );
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
+        "symfony/asset": "~2.7|~3.0.0",
         "symfony/dependency-injection" : "~2.6,>=2.6.2",
         "symfony/config" : "~2.4",
         "symfony/event-dispatcher": "~2.5|~3.0.0",
@@ -48,7 +49,6 @@
         "symfony/yaml": "~2.0,>=2.0.5|~3.0.0"
     },
     "suggest": {
-        "symfony/asset": "",
         "symfony/console": "For using the console commands",
         "symfony/finder": "For using the translation loader and cache warmer",
         "symfony/form": "For using forms",

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,13 @@ protected static function getBundleDefaultConfig()`
`145`	`145`	`'magic_call' => false,`
`146`	`146`	`'throw_exception_on_invalid_index' => false,`
`147`	`147`	`),`
	`148`	`+ 'assets' => array(`
	`149`	`+ 'version' => null,`
	`150`	`+ 'version_format' => '%%s?%%s',`
	`151`	`+ 'base_path' => '',`
	`152`	`+ 'base_urls' => array(),`
	`153`	`+ 'packages' => array(),`
	`154`	`+ ),`
`148`	`155`	`);`
`149`	`156`	`}`
`150`	`157`	`}`