Merge branch '10.5' into 11.0

Author: sebastianbergmann

build.xml

@@ -33,6 +33,7 @@
         <exec executable="${basedir}/build/scripts/generate-global-assert-wrappers.php" taskname="generate-global-assert-wrappers" failonerror="true"/>
         <exec executable="${basedir}/tools/php-cs-fixer" taskname="php-cs-fixer" failonerror="true">
             <arg value="fix"/>
+            <arg value="--show-progress=none"/>
             <arg path="${basedir}/src/Framework/Assert/Functions.php"/>
         </exec>
     </target>

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

@@ -64,6 +64,11 @@
 
     $usedClasses[] = $returnType->getName();
 
+    // skip, so we can later on append a signature including precise analysis types
+    if ($method->getName() === 'callback') {
+        continue;
+    }
+
     $constraintMethods .= \sprintf(
         "if (!function_exists('PHPUnit\Framework\\" . $method->getName() . "')) {\n%s\n{\n    return Assert::%s(...\\func_get_args());\n}\n}\n\n",
         \str_replace('final public static ', '', \trim($lines[$method->getStartLine() - 1])),
@@ -105,6 +110,19 @@
 $buffer .= $constraintMethods;
 
 $buffer .= <<<'EOT'
+if (!function_exists('PHPUnit\Framework\callback')) {
+    /**
+     * @psalm-template CallbackInput of mixed
+     *
+     * @psalm-param callable(CallbackInput $callback): bool $callback
+     *
+     * @psalm-return Callback<CallbackInput>
+     */
+    function callback(callable $callback): Callback
+    {
+        return Assert::callback($callback);
+    }
+}
 
 if (!function_exists('PHPUnit\Framework\any')) {
     /**

src/Framework/Assert/Functions.php

@@ -2384,13 +2384,6 @@ function isTrue(): IsTrue
     }
 }
 
-if (!function_exists('PHPUnit\Framework\callback')) {
-    function callback(callable $callback): Callback
-    {
-        return Assert::callback(...func_get_args());
-    }
-}
-
 if (!function_exists('PHPUnit\Framework\isFalse')) {
     function isFalse(): IsFalse
     {
@@ -2643,6 +2636,20 @@ function objectEquals(object $object, string $method = 'equals'): ObjectEquals
     }
 }
 
+if (!function_exists('PHPUnit\Framework\callback')) {
+    /**
+     * @psalm-template CallbackInput of mixed
+     *
+     * @psalm-param callable(CallbackInput $callback): bool $callback
+     *
+     * @psalm-return Callback<CallbackInput>
+     */
+    function callback(callable $callback): Callback
+    {
+        return Assert::callback($callback);
+    }
+}
+
 if (!function_exists('PHPUnit\Framework\any')) {
     /**
      * Returns a matcher that matches when the method is executed