Skip to content

Commit a551af1

Browse files
committed
Remove use of ForwardCompatTrait
1 parent c90e14e commit a551af1

File tree

5 files changed

+7
-22
lines changed

5 files changed

+7
-22
lines changed

Tests/Command/LintCommandTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Yaml\Tests\Command;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1615
use Symfony\Component\Console\Application;
1716
use Symfony\Component\Console\Output\OutputInterface;
1817
use Symfony\Component\Console\Tester\CommandTester;
@@ -25,8 +24,6 @@
2524
*/
2625
class LintCommandTest extends TestCase
2726
{
28-
use ForwardCompatTestTrait;
29-
3027
private $files;
3128

3229
public function testLintCorrectFile()
@@ -116,13 +113,13 @@ protected function createCommandTester()
116113
return new CommandTester($command);
117114
}
118115

119-
private function doSetUp()
116+
protected function setUp()
120117
{
121118
$this->files = [];
122119
@mkdir(sys_get_temp_dir().'/framework-yml-lint-test');
123120
}
124121

125-
private function doTearDown()
122+
protected function tearDown()
126123
{
127124
foreach ($this->files as $file) {
128125
if (file_exists($file)) {

Tests/DumperTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@
1212
namespace Symfony\Component\Yaml\Tests;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1615
use Symfony\Component\Yaml\Dumper;
1716
use Symfony\Component\Yaml\Parser;
1817
use Symfony\Component\Yaml\Tag\TaggedValue;
1918
use Symfony\Component\Yaml\Yaml;
2019

2120
class DumperTest extends TestCase
2221
{
23-
use ForwardCompatTestTrait;
24-
2522
protected $parser;
2623
protected $dumper;
2724
protected $path;
@@ -41,14 +38,14 @@ class DumperTest extends TestCase
4138
],
4239
];
4340

44-
private function doSetUp()
41+
protected function setUp()
4542
{
4643
$this->parser = new Parser();
4744
$this->dumper = new Dumper();
4845
$this->path = __DIR__.'/Fixtures';
4946
}
5047

51-
private function doTearDown()
48+
protected function tearDown()
5249
{
5350
$this->parser = null;
5451
$this->dumper = null;

Tests/InlineTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@
1212
namespace Symfony\Component\Yaml\Tests;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1615
use Symfony\Component\Yaml\Exception\ParseException;
1716
use Symfony\Component\Yaml\Inline;
1817
use Symfony\Component\Yaml\Yaml;
1918

2019
class InlineTest extends TestCase
2120
{
22-
use ForwardCompatTestTrait;
23-
24-
private function doSetUp()
21+
protected function setUp()
2522
{
2623
Inline::initialize(0, 0);
2724
}

Tests/ParserTest.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,21 @@
1212
namespace Symfony\Component\Yaml\Tests;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1615
use Symfony\Component\Yaml\Parser;
1716
use Symfony\Component\Yaml\Tag\TaggedValue;
1817
use Symfony\Component\Yaml\Yaml;
1918

2019
class ParserTest extends TestCase
2120
{
22-
use ForwardCompatTestTrait;
23-
2421
/** @var Parser */
2522
protected $parser;
2623

27-
private function doSetUp()
24+
protected function setUp()
2825
{
2926
$this->parser = new Parser();
3027
}
3128

32-
private function doTearDown()
29+
protected function tearDown()
3330
{
3431
$this->parser = null;
3532

Tests/YamlTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,10 @@
1212
namespace Symfony\Component\Yaml\Tests;
1313

1414
use PHPUnit\Framework\TestCase;
15-
use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
1615
use Symfony\Component\Yaml\Yaml;
1716

1817
class YamlTest extends TestCase
1918
{
20-
use ForwardCompatTestTrait;
21-
2219
public function testParseAndDump()
2320
{
2421
$data = ['lorem' => 'ipsum', 'dolor' => 'sit'];

0 commit comments

Comments
 (0)