Skip to content

Commit 5c42497

Browse files
Merge branch '4.3' into 4.4
* 4.3: Disable phpunit typehint patch on 4.3 branch Fix deprecation on 4.3
2 parents 0af80ab + 4e543ce commit 5c42497

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Tests/Command/LintCommandTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ protected function createCommandTester()
122122
return new CommandTester($command);
123123
}
124124

125-
protected function setUp()
125+
protected function setUp(): void
126126
{
127127
$this->files = [];
128128
@mkdir(sys_get_temp_dir().'/framework-yml-lint-test');
129129
}
130130

131-
protected function tearDown()
131+
protected function tearDown(): void
132132
{
133133
foreach ($this->files as $file) {
134134
if (file_exists($file)) {

Tests/DumperTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ class DumperTest extends TestCase
3838
],
3939
];
4040

41-
protected function setUp()
41+
protected function setUp(): void
4242
{
4343
$this->parser = new Parser();
4444
$this->dumper = new Dumper();
4545
$this->path = __DIR__.'/Fixtures';
4646
}
4747

48-
protected function tearDown()
48+
protected function tearDown(): void
4949
{
5050
$this->parser = null;
5151
$this->dumper = null;

Tests/InlineTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
class InlineTest extends TestCase
2121
{
22-
protected function setUp()
22+
protected function setUp(): void
2323
{
2424
Inline::initialize(0, 0);
2525
}

Tests/ParserTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ class ParserTest extends TestCase
2121
/** @var Parser */
2222
protected $parser;
2323

24-
protected function setUp()
24+
protected function setUp(): void
2525
{
2626
$this->parser = new Parser();
2727
}
2828

29-
protected function tearDown()
29+
protected function tearDown(): void
3030
{
3131
$this->parser = null;
3232

0 commit comments

Comments
 (0)