Merge branch '2.3' into 2.6

nicolas-grekas · nicolas-grekas · commit 3f8969c0af7c · 2015-03-12T11:28:44.000+01:00
* 2.3:
  Changed visibility of setUp() and tearDown to protected
  fixed XSS in the exception handler
  Php Inspections (EA Extended) - static code analysis includes:
  [2.3] Remove most refs uses
  Test with local components instead of waiting for the subtree-splitter when possible

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Component/Config/Util/XmlUtils.php
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Yaml/Inline.php
diff --git a/DataCollector/MemoryDataCollector.php b/DataCollector/MemoryDataCollector.php
@@ -94,7 +94,7 @@ private function convertToBytes($memoryLimit)
         } elseif (0 === strpos($max, '0')) {
             $max = intval($max, 8);
         } else {
-            $max = intval($max);
+            $max = (int) $max;
         }
 
         switch (substr($memoryLimit, -1)) {

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ private function convertToBytes($memoryLimit)`
`94`	`94`	`} elseif (0 === strpos($max, '0')) {`
`95`	`95`	`$max = intval($max, 8);`
`96`	`96`	`} else {`
`97`		`- $max = intval($max);`
	`97`	`+ $max = (int) $max;`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`switch (substr($memoryLimit, -1)) {`