bug #45240 [Console] Revert StringInput bc break from #45088 (bobthecow)

fancyweb · fancyweb · commit 1276d3244239 · 2022-01-31T09:18:02.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [Console] Revert StringInput bc break from #45088 | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix bobthecow/psysh#703 | License | MIT | Doc PR | - Fix a backwards compatibility break introduced in #45088 and released in v4.4.37, v5.3.14, v5.4.3 and v6.0.3. I went with `REGEX_UNQUOTED_STRING` by analog to the `REGEX_QUOTED_STRING` constant name, but don't have a strong opinion on what it should be called :) Commits ------- aab2f2a [Console] Revert StringInput bc break from #45088
diff --git a/src/Symfony/Component/Console/Input/StringInput.php b/src/Symfony/Component/Console/Input/StringInput.php
@@ -24,7 +24,8 @@
  */
 class StringInput extends ArgvInput
 {
-    public const REGEX_STRING = '([^\s\\\\]+?)';
+    public const REGEX_STRING = '([^\s]+?)(?:\s|(?<!\\\\)"|(?<!\\\\)\'|$)';
+    public const REGEX_UNQUOTED_STRING = '([^\s\\\\]+?)';
     public const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\')';
 
     /**
@@ -64,7 +65,7 @@ private function tokenize(string $input): array
                 $token .= $match[1].$match[2].stripcslashes(str_replace(['"\'', '\'"', '\'\'', '""'], '', substr($match[3], 1, -1)));
             } elseif (preg_match('/'.self::REGEX_QUOTED_STRING.'/A', $input, $match, 0, $cursor)) {
                 $token .= stripcslashes(substr($match[0], 1, -1));
-            } elseif (preg_match('/'.self::REGEX_STRING.'/A', $input, $match, 0, $cursor)) {
+            } elseif (preg_match('/'.self::REGEX_UNQUOTED_STRING.'/A', $input, $match, 0, $cursor)) {
                 $token .= $match[1];
             } else {
                 // should never happen
