Closes #4435

Author: sebastianbergmann

ChangeLog-9.3.md

@@ -2,6 +2,12 @@
 
 All notable changes of the PHPUnit 9.3 release series are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles.
 
+## [9.3.8] - 2020-MM-DD
+
+### Fixed
+
+* [#4435](https://github.com/sebastianbergmann/phpunit/issues/4435): Global assert wrappers break preloading
+
 ## [9.3.7] - 2020-08-11
 
 ### Fixed
@@ -219,6 +225,7 @@ If you have an XML configuration file that validates against [PHPUnit 9.2's XML
 * [#4396](https://github.com/sebastianbergmann/phpunit/issues/4396): Deprecate confusing parameter options for XML assertions
 * The `cacheTokens` attribute is no longer supported in XML configuration files
 
+[9.3.8]: https://github.com/sebastianbergmann/phpunit/compare/9.3.7...9.3
 [9.3.7]: https://github.com/sebastianbergmann/phpunit/compare/9.3.6...9.3.7
 [9.3.6]: https://github.com/sebastianbergmann/phpunit/compare/9.3.5...9.3.6
 [9.3.5]: https://github.com/sebastianbergmann/phpunit/compare/9.3.4...9.3.5

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

@@ -75,7 +75,6 @@
 }
 
 $buffer .= "\n";
-$buffer .= "if (!\defined('__PHPUNIT_GLOBAL_ASSERT_WRAPPERS__')) {\n";
 
 foreach ($class->getMethods() as $method) {
     if (\strpos($method->getName(), 'assert') !== 0) {
@@ -90,128 +89,162 @@
 
     $signature = \str_replace('public static ', '', \trim($lines[$method->getStartLine() - 1]));
     $body      = "{\n    Assert::" . $method->getName() . "(...\\func_get_args());\n}";
-    $buffer .= "$docComment\n$signature\n$body\n\n";
+
+    $buffer .= "if (!function_exists('PHPUnit\Framework\\" . $method->getName() . "')) {\n";
+    $buffer .= "$docComment\n$signature\n$body\n";
+    $buffer .= "}\n\n";
 }
 
 $buffer .= $constraintMethods;
 
-$buffer .= '/**
- * Returns a matcher that matches when the method is executed
- * zero or more times.
- */
-function any(): AnyInvokedCountMatcher
-{
-    return new AnyInvokedCountMatcher;
+$buffer .= <<<'EOT'
+
+if (!function_exists('PHPUnit\Framework\any')) {
+    /**
+     * Returns a matcher that matches when the method is executed
+     * zero or more times.
+     */
+    function any(): AnyInvokedCountMatcher
+    {
+        return new AnyInvokedCountMatcher;
+    }
 }
 
-/**
- * Returns a matcher that matches when the method is never executed.
- */
-function never(): InvokedCountMatcher
-{
-    return new InvokedCountMatcher(0);
+if (!function_exists('PHPUnit\Framework\never')) {
+    /**
+     * Returns a matcher that matches when the method is never executed.
+     */
+    function never(): InvokedCountMatcher
+    {
+        return new InvokedCountMatcher(0);
+    }
 }
 
-/**
- * Returns a matcher that matches when the method is executed
- * at least N times.
- */
-function atLeast(int $requiredInvocations): InvokedAtLeastCountMatcher
-{
-    return new InvokedAtLeastCountMatcher(
-        $requiredInvocations
-    );
+if (!function_exists('PHPUnit\Framework\atLeast')) {
+    /**
+     * Returns a matcher that matches when the method is executed
+     * at least N times.
+     */
+    function atLeast(int $requiredInvocations): InvokedAtLeastCountMatcher
+    {
+        return new InvokedAtLeastCountMatcher(
+            $requiredInvocations
+        );
+    }
 }
 
-/**
- * Returns a matcher that matches when the method is executed at least once.
- */
-function atLeastOnce(): InvokedAtLeastOnceMatcher
-{
-    return new InvokedAtLeastOnceMatcher;
+if (!function_exists('PHPUnit\Framework\atLeastOnce')) {
+    /**
+     * Returns a matcher that matches when the method is executed at least once.
+     */
+    function atLeastOnce(): InvokedAtLeastOnceMatcher
+    {
+        return new InvokedAtLeastOnceMatcher;
+    }
 }
 
-/**
- * Returns a matcher that matches when the method is executed exactly once.
- */
-function once(): InvokedCountMatcher
-{
-    return new InvokedCountMatcher(1);
+if (!function_exists('PHPUnit\Framework\once')) {
+    /**
+     * Returns a matcher that matches when the method is executed exactly once.
+     */
+    function once(): InvokedCountMatcher
+    {
+        return new InvokedCountMatcher(1);
+    }
 }
 
-/**
- * Returns a matcher that matches when the method is executed
- * exactly $count times.
- */
-function exactly(int $count): InvokedCountMatcher
-{
-    return new InvokedCountMatcher($count);
+if (!function_exists('PHPUnit\Framework\exactly')) {
+    /**
+     * Returns a matcher that matches when the method is executed
+     * exactly $count times.
+     */
+    function exactly(int $count): InvokedCountMatcher
+    {
+        return new InvokedCountMatcher($count);
+    }
 }
 
-/**
- * Returns a matcher that matches when the method is executed
- * at most N times.
- */
-function atMost(int $allowedInvocations): InvokedAtMostCountMatcher
-{
-    return new InvokedAtMostCountMatcher($allowedInvocations);
+if (!function_exists('PHPUnit\Framework\atMost')) {
+    /**
+     * Returns a matcher that matches when the method is executed
+     * at most N times.
+     */
+    function atMost(int $allowedInvocations): InvokedAtMostCountMatcher
+    {
+        return new InvokedAtMostCountMatcher($allowedInvocations);
+    }
 }
 
-/**
- * Returns a matcher that matches when the method is executed
- * at the given index.
- */
-function at(int $index): InvokedAtIndexMatcher
-{
-    return new InvokedAtIndexMatcher($index);
+if (!function_exists('PHPUnit\Framework\at')) {
+    /**
+     * Returns a matcher that matches when the method is executed
+     * at the given index.
+     */
+    function at(int $index): InvokedAtIndexMatcher
+    {
+        return new InvokedAtIndexMatcher($index);
+    }
 }
 
-function returnValue($value): ReturnStub
-{
-    return new ReturnStub($value);
+if (!function_exists('PHPUnit\Framework\returnValue')) {
+    function returnValue($value): ReturnStub
+    {
+        return new ReturnStub($value);
+    }
 }
 
-function returnValueMap(array $valueMap): ReturnValueMapStub
-{
-    return new ReturnValueMapStub($valueMap);
+if (!function_exists('PHPUnit\Framework\returnValueMap')) {
+    function returnValueMap(array $valueMap): ReturnValueMapStub
+    {
+        return new ReturnValueMapStub($valueMap);
+    }
 }
 
-function returnArgument(int $argumentIndex): ReturnArgumentStub
-{
-    return new ReturnArgumentStub($argumentIndex);
+if (!function_exists('PHPUnit\Framework\returnArgument')) {
+    function returnArgument(int $argumentIndex): ReturnArgumentStub
+    {
+        return new ReturnArgumentStub($argumentIndex);
+    }
 }
 
-function returnCallback($callback): ReturnCallbackStub
-{
-    return new ReturnCallbackStub($callback);
+if (!function_exists('PHPUnit\Framework\returnCallback')) {
+    function returnCallback($callback): ReturnCallbackStub
+    {
+        return new ReturnCallbackStub($callback);
+    }
 }
 
-/**
- * Returns the current object.
- *
- * This method is useful when mocking a fluent interface.
- */
-function returnSelf(): ReturnSelfStub
-{
-    return new ReturnSelfStub;
+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;
+    }
 }
 
-function throwException(\Throwable $exception): ExceptionStub
-{
-    return new ExceptionStub($exception);
+if (!function_exists('PHPUnit\Framework\throwException')) {
+    function throwException(\Throwable $exception): ExceptionStub
+    {
+        return new ExceptionStub($exception);
+    }
 }
 
-/**
- * @param mixed $value , ...
- */
-function onConsecutiveCalls(): ConsecutiveCallsStub
-{
-    $args = \func_get_args();
+if (!function_exists('PHPUnit\Framework\onConsecutiveCalls')) {
+    /**
+     * @param mixed $value , ...
+     */
+    function onConsecutiveCalls(): ConsecutiveCallsStub
+    {
+        $args = \func_get_args();
 
-    return new ConsecutiveCallsStub($args);
+        return new ConsecutiveCallsStub($args);
+    }
 }
-';
 
-$buffer .= "\ndefine('__PHPUNIT_GLOBAL_ASSERT_WRAPPERS__', true);\n}";
+EOT;
 
 \file_put_contents(__DIR__ . '/../../src/Framework/Assert/Functions.php', $buffer);