Fix nested brackets

Author: dantleech

src/Util/FileMatcher.php

@@ -137,6 +137,7 @@ private static function processTokens(array $tokens): array
     {
         $resolved = [];
         $escaped  = false;
+        $bracketOpen = false;
         $brackets = [];
 
         for ($offset = 0; $offset < count($tokens); $offset++) {
@@ -205,14 +206,24 @@ private static function processTokens(array $tokens): array
             }
 
             if ($type === self::T_BRACKET_OPEN && $tokens[$offset + 1][0] === self::T_BRACKET_CLOSE) {
-                $resolved[] = [self::T_BRACKET_OPEN, $char];
+                $bracketOpen = true;
+                $resolved[] = [self::T_BRACKET_OPEN, '['];
                 $brackets[] = array_key_last($resolved);
-                $resolved[] = [self::T_CHAR, $char];
+                $resolved[] = [self::T_CHAR, ']'];
+                $offset += 1;
+
+                continue;
+            }
 
+            if ($bracketOpen === true && $type === self::T_BRACKET_OPEN) {
+                // if bracket is already open, interpret everything as a
+                // literal char
+                $resolved[] = [self::T_CHAR, $char];
                 continue;
             }
 
-            if ($type === self::T_BRACKET_OPEN) {
+            if ($bracketOpen === false && $type === self::T_BRACKET_OPEN) {
+                $bracketOpen = true;
                 $resolved[] = [$type, $char];
                 $brackets[] = array_key_last($resolved);
 

tests/unit/Util/FileMatcherTest.php

@@ -297,22 +297,24 @@ public static function provideCharacterGroup(): Generator
         yield 'unterminated char group followed by char group' => [
             new FileMatcherPattern('/[AB[a-z]'),
             [
-                '/['        => false,
-                '/[Ac'      => false,
-                '/[ABc'     => true,
-                '/[ABc/foo' => true,
+                '/[' => true, // nested [ is literal
+                '/f' => true, // within a-z
+                '/A' => true,
+                '/B' => true,
+
+                '/Z' => false,
+                '/[c' => false,
             ],
         ];
 
         yield 'multiple unterminated char groups followed by char group' => [
             new FileMatcherPattern('/[AB[CD[a-z]EF'),
             [
-                '/['         => false,
-                '/[Ac'       => false,
-                '/[AB[C'     => false,
-                '/[AB[CD'    => false,
-                '/[AB[CDz'   => false,
-                '/[AB[CDzEF' => true,
+                '/[EF' => true,
+                '/AEF' => true,
+                '/[EF' => true,
+                '/DEF' => true,
+                '/EEF' => false,
             ],
         ];
 
@@ -358,7 +360,7 @@ public static function provideCharacterGroup(): Generator
 
         // https://man7.org/linux/man-pages/man7/glob.7.html
         yield 'square bracket in char group' => [
-            new FileMatcherPattern('/[][!]'),
+            new FileMatcherPattern('/[][!]*'),
             [
                 '/[hello' => true,
                 '/['      => true,
@@ -367,7 +369,6 @@ public static function provideCharacterGroup(): Generator
                 '/a'      => false,
                 '/'       => false,
             ],
-            'This test fails because `[` should be interpreted a literal',
         ];
 
         yield 'match ranges' => [