Remove wrapper functions for #5424

Author: sebastianbergmann

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

@@ -200,68 +200,13 @@ function atMost(int $allowedInvocations): InvokedAtMostCountMatcher
     }
 }
 
-if (!function_exists('PHPUnit\Framework\returnValue')) {
-    function returnValue(mixed $value): ReturnStub
-    {
-        return new ReturnStub($value);
-    }
-}
-
-if (!function_exists('PHPUnit\Framework\returnValueMap')) {
-    /**
-     * @param array<mixed> $valueMap
-     */
-    function returnValueMap(array $valueMap): ReturnValueMapStub
-    {
-        return new ReturnValueMapStub($valueMap);
-    }
-}
-
-if (!function_exists('PHPUnit\Framework\returnArgument')) {
-    function returnArgument(int $argumentIndex): ReturnArgumentStub
-    {
-        return new ReturnArgumentStub($argumentIndex);
-    }
-}
-
-if (!function_exists('PHPUnit\Framework\returnCallback')) {
-    function returnCallback(callable $callback): ReturnCallbackStub
-    {
-        return new ReturnCallbackStub($callback);
-    }
-}
-
-if (!function_exists('PHPUnit\Framework\returnSelf')) {
-    /**
-     * Returns the current object.
-     *
-     * This method is useful when mocking a fluent interface.
-     */
-    function returnSelf(): ReturnSelfStub
-    {
-        return new ReturnSelfStub;
-    }
-}
-
 if (!function_exists('PHPUnit\Framework\throwException')) {
     function throwException(\Throwable $exception): ExceptionStub
     {
         return new ExceptionStub($exception);
     }
 }
 
-if (!function_exists('PHPUnit\Framework\onConsecutiveCalls')) {
-    /**
-     * @param mixed $value , ...
-     */
-    function onConsecutiveCalls(): ConsecutiveCallsStub
-    {
-        $arguments = \func_get_args();
-
-        return new ConsecutiveCallsStub($arguments);
-    }
-}
-
 EOT;
 
 \file_put_contents(__DIR__ . '/../../src/Framework/Assert/Functions.php', $buffer);

src/Framework/Assert/Functions.php

@@ -59,13 +59,7 @@
 use PHPUnit\Framework\MockObject\Rule\InvokedAtLeastOnce as InvokedAtLeastOnceMatcher;
 use PHPUnit\Framework\MockObject\Rule\InvokedAtMostCount as InvokedAtMostCountMatcher;
 use PHPUnit\Framework\MockObject\Rule\InvokedCount as InvokedCountMatcher;
-use PHPUnit\Framework\MockObject\Stub\ConsecutiveCalls as ConsecutiveCallsStub;
 use PHPUnit\Framework\MockObject\Stub\Exception as ExceptionStub;
-use PHPUnit\Framework\MockObject\Stub\ReturnArgument as ReturnArgumentStub;
-use PHPUnit\Framework\MockObject\Stub\ReturnCallback as ReturnCallbackStub;
-use PHPUnit\Framework\MockObject\Stub\ReturnSelf as ReturnSelfStub;
-use PHPUnit\Framework\MockObject\Stub\ReturnStub;
-use PHPUnit\Framework\MockObject\Stub\ReturnValueMap as ReturnValueMapStub;
 use PHPUnit\Util\Xml\XmlException;
 use Throwable;
 
@@ -2745,61 +2739,9 @@ function atMost(int $allowedInvocations): InvokedAtMostCountMatcher
     }
 }
 
-if (!function_exists('PHPUnit\Framework\returnValue')) {
-    function returnValue(mixed $value): ReturnStub
-    {
-        return new ReturnStub($value);
-    }
-}
-
-if (!function_exists('PHPUnit\Framework\returnValueMap')) {
-    /**
-     * @param array<mixed> $valueMap
-     */
-    function returnValueMap(array $valueMap): ReturnValueMapStub
-    {
-        return new ReturnValueMapStub($valueMap);
-    }
-}
-
-if (!function_exists('PHPUnit\Framework\returnArgument')) {
-    function returnArgument(int $argumentIndex): ReturnArgumentStub
-    {
-        return new ReturnArgumentStub($argumentIndex);
-    }
-}
-
-if (!function_exists('PHPUnit\Framework\returnCallback')) {
-    function returnCallback(callable $callback): ReturnCallbackStub
-    {
-        return new ReturnCallbackStub($callback);
-    }
-}
-
-if (!function_exists('PHPUnit\Framework\returnSelf')) {
-    /**
-     * Returns the current object.
-     *
-     * This method is useful when mocking a fluent interface.
-     */
-    function returnSelf(): ReturnSelfStub
-    {
-        return new ReturnSelfStub;
-    }
-}
-
 if (!function_exists('PHPUnit\Framework\throwException')) {
     function throwException(Throwable $exception): ExceptionStub
     {
         return new ExceptionStub($exception);
     }
 }
-
-if (!function_exists('PHPUnit\Framework\onConsecutiveCalls')) {
-    function onConsecutiveCalls(): ConsecutiveCallsStub
-    {
-        $arguments = func_get_args();
-
-        return new ConsecutiveCallsStub($arguments);
-    }
-}