[Finder] Glob wildcard while using double-star without ending slash

Author: sroze

Glob.php

@@ -60,9 +60,19 @@ public static function toRegex($glob, $strictLeadingDot = true, $strictWildcardS
 
             $firstByte = '/' === $car;
 
-            if ($firstByte && $strictWildcardSlash && isset($glob[$i + 3]) && '**/' === $glob[$i + 1].$glob[$i + 2].$glob[$i + 3]) {
-                $car = $strictLeadingDot ? '/(?:(?=[^\.])[^/]++/)*' : '/(?:[^/]++/)*';
-                $i += 3;
+            if ($firstByte && $strictWildcardSlash && isset($glob[$i + 2]) && '**' === $glob[$i + 1].$glob[$i + 2] && (!isset($glob[$i + 3]) || '/' === $glob[$i + 3])) {
+                $car = '[^/]++/';
+                if (!isset($glob[$i + 3])) {
+                    $car .= '?';
+                }
+
+                if ($strictLeadingDot) {
+                    $car = '(?=[^\.])'.$car;
+                }
+
+                $car = '/(?:'.$car.')*';
+                $i += 2 + isset($glob[$i + 3]);
+
                 if ('/' === $delimiter) {
                     $car = str_replace('/', '\\/', $car);
                 }

Tests/Fixtures/one/.dot

@@ -0,0 +1 @@
+.dot

Tests/GlobTest.php

@@ -58,4 +58,38 @@ public function testGlobToRegexDoubleStarNonStrictDots()
 
         $this->assertSame(array('.dot/b/c.neon', '.dot/b/d.neon', 'one/b/c.neon', 'one/b/d.neon'), $match);
     }
+
+    public function testGlobToRegexDoubleStarWithoutLeadingSlash()
+    {
+        $finder = new Finder();
+        $finder->ignoreDotFiles(false);
+        $regex = Glob::toRegex('/Fixtures/one/**');
+
+        foreach ($finder->in(__DIR__) as $k => $v) {
+            $k = str_replace(DIRECTORY_SEPARATOR, '/', $k);
+            if (preg_match($regex, substr($k, strlen(__DIR__)))) {
+                $match[] = substr($k, 10 + strlen(__DIR__));
+            }
+        }
+        sort($match);
+
+        $this->assertSame(array('one/a', 'one/b', 'one/b/c.neon', 'one/b/d.neon'), $match);
+    }
+
+    public function testGlobToRegexDoubleStarWithoutLeadingSlashNotStrictLeadingDot()
+    {
+        $finder = new Finder();
+        $finder->ignoreDotFiles(false);
+        $regex = Glob::toRegex('/Fixtures/one/**', false);
+
+        foreach ($finder->in(__DIR__) as $k => $v) {
+            $k = str_replace(DIRECTORY_SEPARATOR, '/', $k);
+            if (preg_match($regex, substr($k, strlen(__DIR__)))) {
+                $match[] = substr($k, 10 + strlen(__DIR__));
+            }
+        }
+        sort($match);
+
+        $this->assertSame(array('one/.dot', 'one/a', 'one/b', 'one/b/c.neon', 'one/b/d.neon'), $match);
+    }
 }