Merge branch '11.4' into 11.5

Author: sebastianbergmann

build/scripts/generate-global-assert-wrappers.php

@@ -112,11 +112,11 @@
 $buffer .= <<<'EOT'
 if (!function_exists('PHPUnit\Framework\callback')) {
     /**
-     * @psalm-template CallbackInput of mixed
+     * @template CallbackInput of mixed
      *
-     * @psalm-param callable(CallbackInput $callback): bool $callback
+     * @param callable(CallbackInput $callback): bool $callback
      *
-     * @psalm-return Callback<CallbackInput>
+     * @return Callback<CallbackInput>
      */
     function callback(callable $callback): Callback
     {
@@ -208,6 +208,9 @@ function returnValue(mixed $value): ReturnStub
 }
 
 if (!function_exists('PHPUnit\Framework\returnValueMap')) {
+    /**
+     * @param array<mixed> $valueMap
+     */
     function returnValueMap(array $valueMap): ReturnValueMapStub
     {
         return new ReturnValueMapStub($valueMap);

src/Framework/Assert.php

@@ -195,6 +195,8 @@ final public static function assertArrayNotHasKey(int|string $key, array|ArrayAc
     }
 
     /**
+     * @phpstan-assert list $array
+     *
      * @throws ExpectationFailedException
      */
     final public static function assertIsList(mixed $array, string $message = ''): void

src/Framework/Assert/Functions.php

@@ -193,6 +193,8 @@ function assertArrayNotHasKey(int|string $key, array|ArrayAccess $array, string
 
 if (!function_exists('PHPUnit\Framework\assertIsList')) {
     /**
+     * @phpstan-assert list $array
+     *
      * @throws ExpectationFailedException
      *
      * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -279,7 +281,8 @@ function assertNotContainsEquals(mixed $needle, iterable $haystack, string $mess
     /**
      * Asserts that a haystack contains only values of a given type.
      *
-     * @param iterable<mixed> $haystack
+     * @param 'array'|'bool'|'boolean'|'callable'|'double'|'float'|'int'|'integer'|'iterable'|'null'|'numeric'|'object'|'real'|'resource (closed)'|'resource'|'scalar'|'string' $type
+     * @param iterable<mixed>                                                                                                                                                   $haystack
      *
      * @throws Exception
      * @throws ExpectationFailedException
@@ -298,6 +301,7 @@ function assertContainsOnly(string $type, iterable $haystack, ?bool $isNativeTyp
     /**
      * Asserts that a haystack contains only instances of a given class name.
      *
+     * @param class-string    $className
      * @param iterable<mixed> $haystack
      *
      * @throws Exception
@@ -317,7 +321,8 @@ function assertContainsOnlyInstancesOf(string $className, iterable $haystack, st
     /**
      * Asserts that a haystack does not contain only values of a given type.
      *
-     * @param iterable<mixed> $haystack
+     * @param 'array'|'bool'|'boolean'|'callable'|'double'|'float'|'int'|'integer'|'iterable'|'null'|'numeric'|'object'|'real'|'resource (closed)'|'resource'|'scalar'|'string' $type
+     * @param iterable<mixed>                                                                                                                                                   $haystack
      *
      * @throws Exception
      * @throws ExpectationFailedException