minor #13672 [FrameworkBundle] Enable assets by default (jakzal)

fabpot · fabpot · commit f44eef45256f · 2015-02-16T10:20:28.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [FrameworkBundle] Enable assets by default | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #13667 | License | MIT | Doc PR | - This should make the tests pass again. There are two templates from TwigBundle that are used with functional tests, and require the asset() helper: * src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig * src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig Commits ------- f5c0a69 [FrameworkBundle] Enable assets by default.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -53,6 +53,26 @@ public function getConfigTreeBuilder()
                     return $v;
                 })
             ->end()
+            ->validate()
+                ->ifTrue(function ($v) { return !isset($v['assets']); })
+                ->then(function ($v) {
+                    if (!$v['templating']['assets_version']
+                        && !count($v['templating']['assets_base_urls']['http'])
+                        && !count($v['templating']['assets_base_urls']['ssl'])
+                        && !count($v['templating']['packages'])
+                    ) {
+                        $v['assets'] = array(
+                            'version' => null,
+                            'version_format' => '%%s?%%s',
+                            'base_path' => '',
+                            'base_urls' => array(),
+                            'packages' => array(),
+                        );
+                    }
+
+                    return $v;
+                })
+            ->end()
             ->validate()
                 ->ifTrue(function ($v) { return isset($v['templating']); })
                 ->then(function ($v) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -164,6 +164,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
`@@ -164,6 +164,13 @@ protected static function getBundleDefaultConfig()`
`164`	`164`	`'magic_call' => false,`
`165`	`165`	`'throw_exception_on_invalid_index' => false,`
`166`	`166`	`),`
	`167`	`+ 'assets' => array(`
	`168`	`+ 'version' => null,`
	`169`	`+ 'version_format' => '%%s?%%s',`
	`170`	`+ 'base_path' => '',`
	`171`	`+ 'base_urls' => array(),`
	`172`	`+ 'packages' => array(),`
	`173`	`+ ),`
`167`	`174`	`);`
`168`	`175`	`}`
`169`	`176`	`}`