Merge branch '2.4' into 2.5

fabpot · fabpot · commit 048af6de79b6 · 2014-07-15T16:15:12.000+02:00
* 2.4: Remove Spaceless Blocks From Twig Templates Validate locales sets intos translator Fix UserPassword validator translation Remove Spaceless Blocks from Twig Form Templates fixed typo [HttpFoundation] Fix to prevent magic bytes injection in JSONP responses (Prevents CVE-2014-4671) added regression test fix issue #8171 on configuration tree for twig extension -- pairing up with @cordoval [HttpFoundation] Fix wrong assertion in Response test [Upgrade] Fixed markdown syntax [2.3][Form] Cleanup & fix phpdocs Added verbosity methods Conflicts: src/Symfony/Component/Form/FormError.php
diff --git a/CacheWarmer/CacheWarmerAggregate.php b/CacheWarmer/CacheWarmerAggregate.php
@@ -52,7 +52,7 @@ public function warmUp($cacheDir)
     /**
      * Checks whether this warmer is optional or not.
      *
-     * @return bool    always true
+     * @return bool    always false
      */
     public function isOptional()
     {

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public function warmUp($cacheDir)`
`52`	`52`	`/**`
`53`	`53`	`* Checks whether this warmer is optional or not.`
`54`	`54`	`*`
`55`		`- * @return bool always true`
	`55`	`+ * @return bool always false`
`56`	`56`	`*/`
`57`	`57`	`public function isOptional()`
`58`	`58`	`{`