Merge branch '11.5'

Author: sebastianbergmann

src/Framework/Assert/Functions.php

@@ -275,16 +275,19 @@ 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
      *
+     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/6056
+     *
      * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
      *
      * @see Assert::assertContainsOnly
      */
-    function assertContainsOnly(NativeType $type, iterable $haystack, string $message = ''): void
+    function assertContainsOnly(string $type, iterable $haystack, ?bool $isNativeType = null, string $message = ''): void
     {
         Assert::assertContainsOnly(...func_get_args());
     }
@@ -530,16 +533,19 @@ 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
      *
+     * @deprecated https://github.com/sebastianbergmann/phpunit/issues/6056
+     *
      * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
      *
      * @see Assert::assertNotContainsOnly
      */
-    function assertNotContainsOnly(NativeType $type, iterable $haystack, string $message = ''): void
+    function assertNotContainsOnly(string $type, iterable $haystack, ?bool $isNativeType = null, string $message = ''): void
     {
         Assert::assertNotContainsOnly(...func_get_args());
     }