From e7ab5faf2f89986a508ab41d3dcb54f5c71b7fca Mon Sep 17 00:00:00 2001 From: Fomafix Date: Wed, 30 Oct 2019 17:17:32 +0100 Subject: [PATCH] Use type hints for TypeError exception This change allows to replace the Assert::parameterType by a type hint in Ie215179b4631fd9071b257772c5cb193547cb7d7. Change-Id: I399a92d3fac0e0849fe3a403c703fe7d32f51257 --- includes/ULSJsonMessageLoader.php | 4 ++-- tests/phpunit/ULSJsonMessageLoaderTest.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/ULSJsonMessageLoader.php b/includes/ULSJsonMessageLoader.php index 7b7334af..876bbe15 100644 --- a/includes/ULSJsonMessageLoader.php +++ b/includes/ULSJsonMessageLoader.php @@ -26,7 +26,7 @@ class ULSJsonMessageLoader { * @param string $language Language code. * @return string[] */ - public static function getFilenames( $language ) { + public static function getFilenames( string $language ) { $filenames = []; $languages = Language::getFallbacksFor( $language ); @@ -54,7 +54,7 @@ class ULSJsonMessageLoader { * @param string $language Language code. * @return array */ - public static function getMessages( $language ) { + public static function getMessages( string $language ) { $contents = []; foreach ( self::getFilenames( $language ) as $filename ) { diff --git a/tests/phpunit/ULSJsonMessageLoaderTest.php b/tests/phpunit/ULSJsonMessageLoaderTest.php index 16d093c3..9d5d14c3 100644 --- a/tests/phpunit/ULSJsonMessageLoaderTest.php +++ b/tests/phpunit/ULSJsonMessageLoaderTest.php @@ -15,14 +15,14 @@ class ULSJsonMessageLoaderTest extends \PHPUnit\Framework\TestCase { public function testGetFilenamesWithBadInput() { $instance = new ULSJsonMessageLoader(); - $this->expectException( \Exception::class ); + $this->expectException( \TypeError::class ); $instance->getFilenames( null ); } public function testGetMessagesWithBadInput() { $instance = new ULSJsonMessageLoader(); - $this->expectException( \Exception::class ); + $this->expectException( \TypeError::class ); $instance->getMessages( null ); }