Skip to content

Commit 5529b61

Browse files
Merge branch '4.4'
* 4.4: Fix compatibility with PHPUnit 8 Disable phpunit typehint patch on 4.3 branch Fix deprecation on 4.3
2 parents 671f4bb + dcb7211 commit 5529b61

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

Tests/Loader/AnnotationClassLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
4545
*/
4646
private $loader;
4747

48-
protected function setUp()
48+
protected function setUp(): void
4949
{
5050
$reader = new AnnotationReader();
5151
$this->loader = new class($reader) extends AnnotationClassLoader {

Tests/Loader/AnnotationDirectoryLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class AnnotationDirectoryLoaderTest extends AbstractAnnotationLoaderTest
1919
protected $loader;
2020
protected $reader;
2121

22-
protected function setUp()
22+
protected function setUp(): void
2323
{
2424
parent::setUp();
2525

Tests/Loader/AnnotationFileLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class AnnotationFileLoaderTest extends AbstractAnnotationLoaderTest
2020
protected $loader;
2121
protected $reader;
2222

23-
protected function setUp()
23+
protected function setUp(): void
2424
{
2525
parent::setUp();
2626

Tests/Loader/DirectoryLoaderTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class DirectoryLoaderTest extends AbstractAnnotationLoaderTest
2323
private $loader;
2424
private $reader;
2525

26-
protected function setUp()
26+
protected function setUp(): void
2727
{
2828
parent::setUp();
2929

Tests/RouterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class RouterTest extends TestCase
2222

2323
private $loader = null;
2424

25-
protected function setUp()
25+
protected function setUp(): void
2626
{
2727
$this->loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
2828
$this->router = new Router($this->loader, 'routing.yml');

0 commit comments

Comments
 (0)