Merge branch '2.7' into 2.8

* 2.7: (40 commits)
  [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
  [2.6][Translator] Extend, refactor and simplify Translator tests.
  Update DebugClassLoader.php
  inject asset packages in assets helper service
  [travis] Do not exclude legacy tests on 2.7
  [HttpFoundation] remove getExtension method
  [2.6][Translation] fix legacy tests.
  [Form] Removed remaining deprecation notices in the test suite
  [Form] Moved deprecation notice triggers to file level
  [Debug] Map PHP errors to LogLevel::CRITICAL
  [Routing][DependencyInjection] Support .yaml extension in YAML loaders
  [DX] improve file loader error for router/other resources in bundle
  [FrameworkBundle] Initialize translator with the default locale.
  [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
  [2.7][Translation] remove duplicate code for loading catalogue.
  [2.6][Translation] remove duplicate code for loading catalogue.
  [HttpKernel] Cleanup ExceptionListener
  CS fixes
  [DependencyInjection] Show better error when the Yaml component is not installed
  [2.3] SCA for Components - reference mismatches
  ...

Author: nicolas-grekas

Expression/Glob.php

@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\Finder\Expression;
 
+use Symfony\Component\Finder\Glob as FinderGlob;
+
 /**
  * @author Jean-François Simon <[email protected]>
  */
@@ -100,58 +102,8 @@ public function isExpandable()
      */
     public function toRegex($strictLeadingDot = true, $strictWildcardSlash = true)
     {
-        $firstByte = true;
-        $escaping = false;
-        $inCurlies = 0;
-        $regex = '';
-        $sizeGlob = strlen($this->pattern);
-        for ($i = 0; $i < $sizeGlob; $i++) {
-            $car = $this->pattern[$i];
-            if ($firstByte) {
-                if ($strictLeadingDot && '.' !== $car) {
-                    $regex .= '(?=[^\.])';
-                }
-
-                $firstByte = false;
-            }
-
-            if ('/' === $car) {
-                $firstByte = true;
-            }
-
-            if ('.' === $car || '(' === $car || ')' === $car || '|' === $car || '+' === $car || '^' === $car || '$' === $car) {
-                $regex .= "\\$car";
-            } elseif ('*' === $car) {
-                $regex .= $escaping ? '\\*' : ($strictWildcardSlash ? '[^/]*' : '.*');
-            } elseif ('?' === $car) {
-                $regex .= $escaping ? '\\?' : ($strictWildcardSlash ? '[^/]' : '.');
-            } elseif ('{' === $car) {
-                $regex .= $escaping ? '\\{' : '(';
-                if (!$escaping) {
-                    ++$inCurlies;
-                }
-            } elseif ('}' === $car && $inCurlies) {
-                $regex .= $escaping ? '}' : ')';
-                if (!$escaping) {
-                    --$inCurlies;
-                }
-            } elseif (',' === $car && $inCurlies) {
-                $regex .= $escaping ? ',' : '|';
-            } elseif ('\\' === $car) {
-                if ($escaping) {
-                    $regex .= '\\\\';
-                    $escaping = false;
-                } else {
-                    $escaping = true;
-                }
-
-                continue;
-            } else {
-                $regex .= $car;
-            }
-            $escaping = false;
-        }
-
-        return new Regex('^'.$regex.'$');
+        $regex = FinderGlob::toRegex($this->pattern, $strictLeadingDot, $strictWildcardSlash, '');
+
+        return new Regex($regex);
     }
 }

Glob.php

@@ -41,10 +41,11 @@ class Glob
      * @param string $glob                The glob pattern
      * @param bool   $strictLeadingDot
      * @param bool   $strictWildcardSlash
+     * @param string $delimiter           Optional delimiter
      *
      * @return string regex The regexp
      */
-    public static function toRegex($glob, $strictLeadingDot = true, $strictWildcardSlash = true)
+    public static function toRegex($glob, $strictLeadingDot = true, $strictWildcardSlash = true, $delimiter = '#')
     {
         $firstByte = true;
         $escaping = false;
@@ -98,6 +99,6 @@ public static function toRegex($glob, $strictLeadingDot = true, $strictWildcardS
             $escaping = false;
         }
 
-        return '#^'.$regex.'$#';
+        return $delimiter.'^'.$regex.'$'.$delimiter;
     }
 }

Tests/FinderTest.php

@@ -306,7 +306,7 @@ public function testIn($adapter)
         $finder = $this->buildFinder($adapter);
         $iterator = $finder->files()->name('*.php')->depth('< 1')->in(array(self::$tmpDir, __DIR__))->getIterator();
 
-        $this->assertIterator(array(self::$tmpDir.DIRECTORY_SEPARATOR.'test.php', __DIR__.DIRECTORY_SEPARATOR.'FinderTest.php'), $iterator);
+        $this->assertIterator(array(self::$tmpDir.DIRECTORY_SEPARATOR.'test.php', __DIR__.DIRECTORY_SEPARATOR.'FinderTest.php', __DIR__.DIRECTORY_SEPARATOR.'GlobTest.php'), $iterator);
     }
 
     /**

Tests/GlobTest.php

@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Finder\Tests;
+
+use Symfony\Component\Finder\Glob;
+
+class GlobTest extends \PHPUnit_Framework_TestCase
+{
+
+    public function testGlobToRegexDelimiters()
+    {
+        $this->assertEquals(Glob::toRegex('.*'), '#^\.[^/]*$#');
+        $this->assertEquals(Glob::toRegex('.*', true, true, ''), '^\.[^/]*$');
+        $this->assertEquals(Glob::toRegex('.*', true, true, '/'), '/^\.[^/]*$/');
+    }
+
+}

Tests/Iterator/IteratorTestCase.php

@@ -51,7 +51,7 @@ protected function assertOrderedIteratorForGroups($expected, \Traversable $itera
         foreach ($expected as $subarray) {
             $temp = array();
             while (count($values) && count($temp) < count($subarray)) {
-                array_push($temp, array_shift($values));
+                $temp[] = array_shift($values);
             }
             sort($temp);
             sort($subarray);

composer.json

@@ -22,9 +22,8 @@
         "symfony/phpunit-bridge": "~2.7|~3.0.0"
     },
     "autoload": {
-        "psr-0": { "Symfony\\Component\\Finder\\": "" }
+        "psr-4": { "Symfony\\Component\\Finder\\": "" }
     },
-    "target-dir": "Symfony/Component/Finder",
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {