From f19b0abe0d516ed7a20aab51e79955ee70a922f9 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sun, 4 Aug 2019 08:59:43 +0200 Subject: [PATCH] [PhpUnitBridge] fix internal annotation --- src/Symfony/Bridge/PhpUnit/Legacy/PolyfillAssertTrait.php | 2 +- src/Symfony/Bridge/PhpUnit/Legacy/PolyfillTestCaseTrait.php | 2 +- src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/PolyfillAssertTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/PolyfillAssertTrait.php index 85cbe17b71..5d564774a7 100644 --- a/src/Symfony/Bridge/PhpUnit/Legacy/PolyfillAssertTrait.php +++ b/src/Symfony/Bridge/PhpUnit/Legacy/PolyfillAssertTrait.php @@ -17,7 +17,7 @@ use PHPUnit\Framework\Constraint\StringContains; use PHPUnit\Framework\Constraint\TraversableContains; /** - * @internal + * This trait is @internal */ trait PolyfillAssertTrait { diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/PolyfillTestCaseTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/PolyfillTestCaseTrait.php index 071a719488..69609c5ea4 100644 --- a/src/Symfony/Bridge/PhpUnit/Legacy/PolyfillTestCaseTrait.php +++ b/src/Symfony/Bridge/PhpUnit/Legacy/PolyfillTestCaseTrait.php @@ -15,7 +15,7 @@ use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; /** - * @internal + * This trait is @internal */ trait PolyfillTestCaseTrait { diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php index 50c805228b..dc3e83b776 100644 --- a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php +++ b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php @@ -156,12 +156,6 @@ if (!file_exists("$PHPUNIT_DIR/$PHPUNIT_VERSION_DIR/phpunit") || $configurationH $alteredCode = preg_replace('/abstract class (?:Assert|PHPUnit_Framework_Assert)[^\{]+\{/', '$0 '.PHP_EOL." use \Symfony\Bridge\PhpUnit\Legacy\PolyfillAssertTrait;", $alteredCode, 1); file_put_contents($alteredFile, $alteredCode); - // remove internal annotation from polyfill - foreach (array('PolyfillTestCaseTrait', 'PolyfillAssertTrait') as $polyfill) { - $traitFile = "./vendor/symfony/phpunit-bridge/Legacy/$polyfill.php"; - file_put_contents($traitFile, str_replace(' * @internal', '', file_get_contents($traitFile))); - } - file_put_contents('phpunit', <<<'EOPHP'