Skip to content

Commit 9e2e38f

Browse files
Merge branch '4.4'
* 4.4: [PhpUnitBridge] fix internal annotation [Mime] added AbstractPart::asDebugString() [Mailer] added a name to the transport [Mailer] added missing entry in the CHANGELOG [FrameworkBundle] add config translator cache_dir [Yaml] Add flag to dump NULL as ~
2 parents 645816e + 9a75aee commit 9e2e38f

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

Legacy/PolyfillAssertTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use PHPUnit\Framework\Constraint\TraversableContains;
1818

1919
/**
20-
* @internal
20+
* This trait is @internal
2121
*/
2222
trait PolyfillAssertTrait
2323
{

Legacy/PolyfillTestCaseTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use PHPUnit\Framework\TestCase;
1616

1717
/**
18-
* @internal
18+
* This trait is @internal
1919
*/
2020
trait PolyfillTestCaseTrait
2121
{

bin/simple-phpunit.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,6 @@
156156
$alteredCode = preg_replace('/abstract class (?:Assert|PHPUnit_Framework_Assert)[^\{]+\{/', '$0 '.PHP_EOL." use \Symfony\Bridge\PhpUnit\Legacy\PolyfillAssertTrait;", $alteredCode, 1);
157157
file_put_contents($alteredFile, $alteredCode);
158158

159-
// remove internal annotation from polyfill
160-
foreach (array('PolyfillTestCaseTrait', 'PolyfillAssertTrait') as $polyfill) {
161-
$traitFile = "./vendor/symfony/phpunit-bridge/Legacy/$polyfill.php";
162-
file_put_contents($traitFile, str_replace(' * @internal', '', file_get_contents($traitFile)));
163-
}
164-
165159
file_put_contents('phpunit', <<<'EOPHP'
166160
<?php
167161

0 commit comments

Comments
 (0)