From f1e9eedb9670c2644ab21fbfc77833b0d759befd Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Sat, 5 Oct 2019 19:44:54 +0200 Subject: [PATCH] Clean up most of b/c for phpunit4 We don't support phpunit4 anymore: https://w.wiki/9UT Change-Id: Id7ad0e139f454becfac87bedca75b271250d387c --- tests/phpunit/FontRepoCompilerTest.php | 1 - tests/phpunit/ResourceLoaderULSJsonMessageModuleTest.php | 1 - tests/phpunit/ResourceLoaderULSModuleTest.php | 1 - tests/phpunit/ULSJsonMessageLoaderTest.php | 5 ++--- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/tests/phpunit/FontRepoCompilerTest.php b/tests/phpunit/FontRepoCompilerTest.php index de403e48..3b2bb1a8 100644 --- a/tests/phpunit/FontRepoCompilerTest.php +++ b/tests/phpunit/FontRepoCompilerTest.php @@ -11,7 +11,6 @@ use \FontRepoCompiler; * @author Thiemo Kreuz */ class FontRepoCompilerTest extends \PHPUnit\Framework\TestCase { - use \PHPUnit4And6Compat; public function testGetLanguages() { $instance = new FontRepoCompiler( '', '' ); diff --git a/tests/phpunit/ResourceLoaderULSJsonMessageModuleTest.php b/tests/phpunit/ResourceLoaderULSJsonMessageModuleTest.php index 739d3908..045c6bb1 100644 --- a/tests/phpunit/ResourceLoaderULSJsonMessageModuleTest.php +++ b/tests/phpunit/ResourceLoaderULSJsonMessageModuleTest.php @@ -11,7 +11,6 @@ use ResourceLoaderULSJsonMessageModule; * @author Thiemo Kreuz */ class ResourceLoaderULSJsonMessageModuleTest extends \PHPUnit\Framework\TestCase { - use \PHPUnit4And6Compat; public function testAllReturnValues() { $instance = new ResourceLoaderULSJsonMessageModule(); diff --git a/tests/phpunit/ResourceLoaderULSModuleTest.php b/tests/phpunit/ResourceLoaderULSModuleTest.php index 5036f621..b8853589 100644 --- a/tests/phpunit/ResourceLoaderULSModuleTest.php +++ b/tests/phpunit/ResourceLoaderULSModuleTest.php @@ -11,7 +11,6 @@ use ResourceLoaderULSModule; * @author Thiemo Kreuz */ class ResourceLoaderULSModuleTest extends \PHPUnit\Framework\TestCase { - use \PHPUnit4And6Compat; public function testAllReturnValues() { $instance = new ResourceLoaderULSModule(); diff --git a/tests/phpunit/ULSJsonMessageLoaderTest.php b/tests/phpunit/ULSJsonMessageLoaderTest.php index 9cec98ae..16d093c3 100644 --- a/tests/phpunit/ULSJsonMessageLoaderTest.php +++ b/tests/phpunit/ULSJsonMessageLoaderTest.php @@ -11,19 +11,18 @@ use ULSJsonMessageLoader; * @author Thiemo Kreuz */ class ULSJsonMessageLoaderTest extends \PHPUnit\Framework\TestCase { - use \PHPUnit4And6Compat; public function testGetFilenamesWithBadInput() { $instance = new ULSJsonMessageLoader(); - $this->setExpectedException( \Exception::class ); + $this->expectException( \Exception::class ); $instance->getFilenames( null ); } public function testGetMessagesWithBadInput() { $instance = new ULSJsonMessageLoader(); - $this->setExpectedException( \Exception::class ); + $this->expectException( \Exception::class ); $instance->getMessages( null ); }