Merge branch '9.2'

sebastianbergmann · Aug 5, 2020 · 005b4e5 · 005b4e5
2 parents bec8f0b + 5ac09f3
commit 005b4e5
Show file tree

Hide file tree

Showing 2 changed files with 2,278 additions and 2,273 deletions.
diff --git a/build/scripts/generate-global-assert-wrappers.php b/build/scripts/generate-global-assert-wrappers.php
@@ -74,6 +74,7 @@
 }
 
 $buffer .= "\n";
+$buffer .= "if (!\defined('__PHPUNIT_GLOBAL_ASSERT_WRAPPERS__')) {\n";
 
 foreach ($class->getMethods() as $method) {
     if (\strpos($method->getName(), 'assert') !== 0) {
@@ -85,6 +86,7 @@
         ["*\n * @see Assert::" . $method->getName() . "\n */", ' *'],
         $method->getDocComment()
     );
+
     $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";
@@ -209,4 +211,6 @@ function onConsecutiveCalls(): ConsecutiveCallsStub
 }
 ';
 
+$buffer .= "\ndefine('__PHPUNIT_GLOBAL_ASSERT_WRAPPERS__', true);\n}";
+
 \file_put_contents(__DIR__ . '/../../src/Framework/Assert/Functions.php', $buffer);