Merge branch '2.x'

Seldaek · Seldaek · commit 00104306927c · 2023-10-11T09:11:09.000+02:00
diff --git a/src/Preg.php b/src/Preg.php
@@ -125,7 +125,7 @@ public static function matchAllStrictGroups(string $pattern, string $subject, ?a
      * @param int-mask<PREG_UNMATCHED_AS_NULL|PREG_OFFSET_CAPTURE> $flags PREG_UNMATCHED_AS_NULL and PREG_MATCH_OFFSET are always set, no other flags are supported
      * @return 0|positive-int
      *
-     * @phpstan-param array<int|string, list<array{string|null, int<-1, max>}>> $matches
+     * @param-out array<int|string, list<array{string|null, int<-1, max>}>> $matches
      */
     public static function matchAllWithOffsets(string $pattern, string $subject, ?array &$matches, int $flags = 0, int $offset = 0): int
     {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public static function matchAllStrictGroups(string $pattern, string $subject, ?a`
`125`	`125`	`* @param int-mask<PREG_UNMATCHED_AS_NULL\|PREG_OFFSET_CAPTURE> $flags PREG_UNMATCHED_AS_NULL and PREG_MATCH_OFFSET are always set, no other flags are supported`
`126`	`126`	`* @return 0\|positive-int`
`127`	`127`	`*`
`128`		`- * @phpstan-param array<int\|string, list<array{string\|null, int<-1, max>}>> $matches`
	`128`	`+ * @param-out array<int\|string, list<array{string\|null, int<-1, max>}>> $matches`
`129`	`129`	`*/`
`130`	`130`	`public static function matchAllWithOffsets(string $pattern, string $subject, ?array &$matches, int $flags = 0, int $offset = 0): int`
`131`	`131`	`{`