Merge branch '2.x'

Author: Seldaek

src/Preg.php

@@ -23,6 +23,8 @@ class Preg
      * @param array<string|null> $matches Set by method
      * @param int-mask<PREG_UNMATCHED_AS_NULL> $flags PREG_UNMATCHED_AS_NULL is always set, no other flags are supported
      * @return 0|1
+     *
+     * @param-out array<int|string, string|null> $matches
      */
     public static function match(string $pattern, string $subject, ?array &$matches = null, int $flags = 0, int $offset = 0): int
     {
@@ -44,7 +46,7 @@ public static function match(string $pattern, string $subject, ?array &$matches
      * @param int-mask<PREG_UNMATCHED_AS_NULL|PREG_OFFSET_CAPTURE> $flags PREG_UNMATCHED_AS_NULL and PREG_OFFSET_CAPTURE are always set, no other flags are supported
      * @return 0|1
      *
-     * @phpstan-param array<int|string, array{string|null, int<-1, max>}> $matches
+     * @param-out array<int|string, array{string|null, int<-1, max>}> $matches
      */
     public static function matchWithOffsets(string $pattern, string $subject, ?array &$matches, int $flags = 0, int $offset = 0): int
     {
@@ -61,6 +63,8 @@ public static function matchWithOffsets(string $pattern, string $subject, ?array
      * @param array<int|string, list<string|null>> $matches Set by method
      * @param int-mask<PREG_UNMATCHED_AS_NULL|PREG_SET_ORDER> $flags PREG_UNMATCHED_AS_NULL is always set, no other flags are supported
      * @return 0|positive-int
+     *
+     * @param-out array<int|string, list<string|null>> $matches
      */
     public static function matchAll(string $pattern, string $subject, ?array &$matches = null, int $flags = 0, int $offset = 0): int
     {
@@ -103,6 +107,8 @@ public static function matchAllWithOffsets(string $pattern, string $subject, ?ar
      * @param string|string[] $replacement
      * @param string $subject
      * @param int             $count Set by method
+     *
+     * @param-out int<0, max> $count
      */
     public static function replace($pattern, $replacement, $subject, int $limit = -1, int &$count = null): string
     {
@@ -128,6 +134,8 @@ public static function replace($pattern, $replacement, $subject, int $limit = -1
      * @param string $subject
      * @param int             $count Set by method
      * @param int-mask<PREG_UNMATCHED_AS_NULL|PREG_OFFSET_CAPTURE> $flags PREG_OFFSET_CAPTURE is supported, PREG_UNMATCHED_AS_NULL is always set
+     *
+     * @param-out int<0, max> $count
      */
     public static function replaceCallback($pattern, callable $replacement, $subject, int $limit = -1, int &$count = null, int $flags = 0): string
     {
@@ -152,6 +160,8 @@ public static function replaceCallback($pattern, callable $replacement, $subject
      * @param string $subject
      * @param int    $count Set by method
      * @param int-mask<PREG_UNMATCHED_AS_NULL|PREG_OFFSET_CAPTURE> $flags PREG_OFFSET_CAPTURE is supported, PREG_UNMATCHED_AS_NULL is always set
+     *
+     * @param-out int<0, max> $count
      */
     public static function replaceCallbackArray(array $pattern, $subject, int $limit = -1, int &$count = null, int $flags = 0): string
     {
@@ -226,6 +236,8 @@ public static function grep(string $pattern, array $array, int $flags = 0): arra
      * @param non-empty-string   $pattern
      * @param array<string|null> $matches Set by method
      * @param int-mask<PREG_UNMATCHED_AS_NULL> $flags PREG_UNMATCHED_AS_NULL is always set, no other flags are supported
+     *
+     * @param-out array<int|string, string|null> $matches
      */
     public static function isMatch(string $pattern, string $subject, ?array &$matches = null, int $flags = 0, int $offset = 0): bool
     {
@@ -236,6 +248,8 @@ public static function isMatch(string $pattern, string $subject, ?array &$matche
      * @param non-empty-string   $pattern
      * @param array<int|string, list<string|null>> $matches Set by method
      * @param int-mask<PREG_UNMATCHED_AS_NULL> $flags PREG_UNMATCHED_AS_NULL is always set, no other flags are supported
+     *
+     * @param-out array<int|string, list<string|null>> $matches
      */
     public static function isMatchAll(string $pattern, string $subject, ?array &$matches = null, int $flags = 0, int $offset = 0): bool
     {
@@ -249,7 +263,7 @@ public static function isMatchAll(string $pattern, string $subject, ?array &$mat
      * @param array<int|string, array{string|null, int}> $matches Set by method
      * @param int-mask<PREG_UNMATCHED_AS_NULL> $flags PREG_UNMATCHED_AS_NULL is always set, no other flags are supported
      *
-     * @phpstan-param array<int|string, array{string|null, int<-1, max>}> $matches
+     * @param-out array<int|string, array{string|null, int<-1, max>}> $matches
      */
     public static function isMatchWithOffsets(string $pattern, string $subject, ?array &$matches, int $flags = 0, int $offset = 0): bool
     {
@@ -263,7 +277,7 @@ public static function isMatchWithOffsets(string $pattern, string $subject, ?arr
      * @param array<int|string, list<array{string|null, int}>> $matches Set by method
      * @param int-mask<PREG_UNMATCHED_AS_NULL> $flags PREG_UNMATCHED_AS_NULL is always set, no other flags are supported
      *
-     * @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 isMatchAllWithOffsets(string $pattern, string $subject, ?array &$matches, int $flags = 0, int $offset = 0): bool
     {