minor #32920 [PhpUnitBridge] fix internal annotation (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 884669b83b13 · 2019-08-04T09:02:16.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [PhpUnitBridge] fix internal annotation | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - This should fix tests. It may require emptying the cache on Travis. Commits ------- f19b0ab [PhpUnitBridge] fix internal annotation
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/PolyfillAssertTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/PolyfillAssertTrait.php
@@ -17,7 +17,7 @@
 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
@@ -15,7 +15,7 @@
 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
@@ -156,12 +156,6 @@
     $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'
 <?php
 

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`use PHPUnit\Framework\Constraint\TraversableContains;`
`18`	`18`
`19`	`19`	`/**`
`20`		`- * @internal`
	`20`	`+ * This trait is @internal`
`21`	`21`	`*/`
`22`	`22`	`trait PolyfillAssertTrait`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use PHPUnit\Framework\TestCase;`
`16`	`16`
`17`	`17`	`/**`
`18`		`- * @internal`
	`18`	`+ * This trait is @internal`
`19`	`19`	`*/`
`20`	`20`	`trait PolyfillTestCaseTrait`
`21`	`21`	`{`