Merge branch '2.6' into 2.7

nicolas-grekas · nicolas-grekas · commit c7f654d74131 · 2015-01-03T23:52:01.000+01:00
* 2.6:
  fixed typo
  Fixed minor typo - override
  [Filesystem] enforce umask while testing
  [TwigBridge] moved fixtures into their own directory
  Use $this-&gt;iniSet() in tests
diff --git a/Core/Authorization/ExpressionLanguage.php b/Core/Authorization/ExpressionLanguage.php
@@ -25,7 +25,7 @@ class ExpressionLanguage extends BaseExpressionLanguage
 {
     public function __construct(ParserCacheInterface $cache = null, array $providers = array())
     {
-        // prepend the default provider to let users overide it easily
+        // prepend the default provider to let users override it easily
         array_unshift($providers, new ExpressionLanguageProvider());
 
         parent::__construct($cache, $providers);

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class ExpressionLanguage extends BaseExpressionLanguage`
`25`	`25`	`{`
`26`	`26`	`public function __construct(ParserCacheInterface $cache = null, array $providers = array())`
`27`	`27`	`{`
`28`		`- // prepend the default provider to let users overide it easily`
	`28`	`+ // prepend the default provider to let users override it easily`
`29`	`29`	`array_unshift($providers, new ExpressionLanguageProvider());`
`30`	`30`
`31`	`31`	`parent::__construct($cache, $providers);`