Merge branch '2.3' into 2.6

* 2.3:
  [2.3][Debug] Fix fatal-errors handling on HHVM
  Standardize the name of the exception variables
  [2.3] Static Code Analysis for Components
  Remove duplicated paths

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
	src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php

Author: nicolas-grekas

Tests/FinderTest.php

@@ -272,7 +272,7 @@ public function testSort($adapter)
     public function testFilter($adapter)
     {
         $finder = $this->buildFinder($adapter);
-        $this->assertSame($finder, $finder->filter(function (\SplFileInfo $f) { return preg_match('/test/', $f) > 0; }));
+        $this->assertSame($finder, $finder->filter(function (\SplFileInfo $f) { return false !== strpos($f, 'test'); }));
         $this->assertIterator($this->toAbsolute(array('test.php', 'test.py')), $finder->in(self::$tmpDir)->getIterator());
     }
 

Tests/Iterator/CustomFilterIteratorTest.php

@@ -39,7 +39,7 @@ public function getAcceptData()
     {
         return array(
             array(array(function (\SplFileInfo $fileinfo) { return false; }), array()),
-            array(array(function (\SplFileInfo $fileinfo) { return preg_match('/^test/', $fileinfo) > 0; }), array('test.php', 'test.py')),
+            array(array(function (\SplFileInfo $fileinfo) { return 0 === strpos($fileinfo, 'test'); }), array('test.php', 'test.py')),
             array(array('is_dir'), array()),
         );
     }

Tests/Iterator/MockSplFileInfo.php

@@ -51,7 +51,7 @@ public function __construct($param)
     public function isFile()
     {
         if (null === $this->type) {
-            return preg_match('/file/', $this->getFilename());
+            return false !== strpos($this->getFilename(), 'file');
         };
 
         return self::TYPE_FILE === $this->type;
@@ -60,7 +60,7 @@ public function isFile()
     public function isDir()
     {
         if (null === $this->type) {
-            return preg_match('/directory/', $this->getFilename());
+            return false !== strpos($this->getFilename(), 'directory');
         }
 
         return self::TYPE_DIRECTORY === $this->type;