From 9d657a562bb6d8b73ca422a333e50e8b130c0c5e Mon Sep 17 00:00:00 2001 From: Marco van 't Wout Date: Wed, 18 Sep 2024 16:25:44 +0200 Subject: [PATCH] Patch moved upstream --- composer.json | 2 +- tests/phpunit_php83.patch | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 tests/phpunit_php83.patch diff --git a/composer.json b/composer.json index fb980afdd..a335b2f1e 100644 --- a/composer.json +++ b/composer.json @@ -109,7 +109,7 @@ "Fix PHP 7 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php7.patch", "Fix PHP 8 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php8.patch", "Fix PHP 8.1 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php81.patch", - "Fix PHP 8.3 compatibility": "tests/phpunit_php83.patch" + "Fix PHP 8.3 compatibility": "https://yiisoft.github.io/phpunit-patches/phpunit_php83.patch" } } }, diff --git a/tests/phpunit_php83.patch b/tests/phpunit_php83.patch deleted file mode 100644 index cdcafe842..000000000 --- a/tests/phpunit_php83.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Util/PHP/Template/TestCaseMethod.tpl.dist -+++ b/src/Util/PHP/Template/TestCaseMethod.tpl.dist -@@ -56,7 +56,7 @@ - } - - @rewind(STDOUT); /* @ as not every STDOUT target stream is rewindable */ -- if ($stdout = stream_get_contents(STDOUT)) { -+ if ($stdout = @stream_get_contents(STDOUT)) { - $output = $stdout . $output; - } -