gen_stub: fix regexps with unintentional range due to - character placement (#12004)

Ayesh · web-flow · commit e6627ccb520f · 2023-08-20T14:20:56.000+02:00
diff --git a/build/gen_stub.php b/build/gen_stub.php
@@ -272,7 +272,7 @@ public static function fromString(string $typeString): SimpleType
         }
 
         $matches = [];
-        $isArray = preg_match("/array\s*<\s*([A-Za-z0-9_-|]+)?(\s*,\s*)?([A-Za-z0-9_-|]+)?\s*>/i", $typeString, $matches);
+        $isArray = preg_match("/array\s*<\s*([A-Za-z0-9_|-]+)?(\s*,\s*)?([A-Za-z0-9_|-]+)?\s*>/i", $typeString, $matches);
         if ($isArray) {
             if (empty($matches[1]) || empty($matches[3])) {
                 throw new Exception("array<> type hint must have both a key and a value");

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ public static function fromString(string $typeString): SimpleType`
`272`	`272`	`}`
`273`	`273`
`274`	`274`	`$matches = [];`
`275`		`- $isArray = preg_match("/array\s<\s([A-Za-z0-9_-\|]+)?(\s,\s)?([A-Za-z0-9_-\|]+)?\s*>/i", $typeString, $matches);`
	`275`	`+ $isArray = preg_match("/array\s<\s([A-Za-z0-9_\|-]+)?(\s,\s)?([A-Za-z0-9_\|-]+)?\s*>/i", $typeString, $matches);`
`276`	`276`	`if ($isArray) {`
`277`	`277`	`if (empty($matches[1]) \|\| empty($matches[3])) {`
`278`	`278`	`throw new Exception("array<> type hint must have both a key and a value");`