From 63471c62b2638cfbb0794a0dd9f2c027c81dd043 Mon Sep 17 00:00:00 2001 From: Pascal Birchler Date: Thu, 16 May 2024 14:49:42 +0200 Subject: [PATCH] PHPStan fixes --- inc/Configuration.php | 4 ++-- tests/phpunit/tests/Export.php | 7 ++----- tests/phpunit/tests/Loader/Git.php | 5 +---- tests/phpunit/tests/Loader/Mercurial.php | 5 +---- tests/phpunit/tests/Loader/Subversion.php | 5 +---- tests/phpunit/tests/Project.php | 12 ++++-------- tests/phpunit/tests/Runner.php | 19 +++++-------------- tests/phpunit/tests/TestCase.php | 1 + tests/phpunit/tests/Updater.php | 12 +++--------- 9 files changed, 20 insertions(+), 50 deletions(-) diff --git a/inc/Configuration.php b/inc/Configuration.php index a6939d5..c6dd0be 100644 --- a/inc/Configuration.php +++ b/inc/Configuration.php @@ -33,7 +33,7 @@ class Configuration { * * @phpstan-var ProjectConfig */ - protected $config = []; + protected array $config = []; /** * Class constructor. @@ -84,7 +84,7 @@ public function get_config(): array { * @phpstan-param T $key * @phpstan-return ProjectConfig[T] | null */ - public function get_config_value( string $key ): string|array|null { + public function get_config_value( string $key ): mixed { if ( isset( $this->config[ $key ] ) ) { return $this->config[ $key ]; } diff --git a/tests/phpunit/tests/Export.php b/tests/phpunit/tests/Export.php index 9556e1f..88c913c 100644 --- a/tests/phpunit/tests/Export.php +++ b/tests/phpunit/tests/Export.php @@ -12,10 +12,7 @@ * Test cases for \Required\Traduttore\Export. */ class Export extends TestCase { - /** - * @var \GP_Translation_Set - */ - protected $translation_set; + protected \GP_Translation_Set $translation_set; public function setUp(): void { parent::setUp(); @@ -149,7 +146,7 @@ public function test_creates_multiple_json_files(): void { * Modify the mapping of sources to translation entries. * * @param array $mapping The mapping of sources to translation entries. - * @return array The maybe modified mapping. + * @return array The maybe modified mapping. */ public function filter_map_entries_to_source( array $mapping ): array { $mapping['build.js'] = array_merge( $mapping['my-super-script.js'], $mapping['my-other-script.js'] ); diff --git a/tests/phpunit/tests/Loader/Git.php b/tests/phpunit/tests/Loader/Git.php index c782429..13ee09a 100644 --- a/tests/phpunit/tests/Loader/Git.php +++ b/tests/phpunit/tests/Loader/Git.php @@ -16,10 +16,7 @@ * @todo Mock shell execution */ class Git extends TestCase { - /** - * @var \Required\Traduttore\Tests\Loader\Project - */ - protected $project; + protected Project $project; public function setUp(): void { parent::setUp(); diff --git a/tests/phpunit/tests/Loader/Mercurial.php b/tests/phpunit/tests/Loader/Mercurial.php index 8fbc0dc..b130d0f 100644 --- a/tests/phpunit/tests/Loader/Mercurial.php +++ b/tests/phpunit/tests/Loader/Mercurial.php @@ -16,10 +16,7 @@ * @todo Mock shell execution */ class Mercurial extends TestCase { - /** - * @var \Required\Traduttore\Tests\Loader\Project - */ - protected $project; + protected Project $project; public function setUp(): void { parent::setUp(); diff --git a/tests/phpunit/tests/Loader/Subversion.php b/tests/phpunit/tests/Loader/Subversion.php index ebc88d2..e0ffa86 100644 --- a/tests/phpunit/tests/Loader/Subversion.php +++ b/tests/phpunit/tests/Loader/Subversion.php @@ -16,10 +16,7 @@ * @todo Mock shell execution */ class Subversion extends TestCase { - /** - * @var \Required\Traduttore\Tests\Loader\Project - */ - protected $project; + protected Project $project; public function setUp(): void { parent::setUp(); diff --git a/tests/phpunit/tests/Project.php b/tests/phpunit/tests/Project.php index 0bdf88e..00abd5b 100644 --- a/tests/phpunit/tests/Project.php +++ b/tests/phpunit/tests/Project.php @@ -7,20 +7,16 @@ use DateTime; use DateTimeZone; +use GP_Project; use Required\Traduttore\Project as TraduttoreProject; /** * Test cases for \Required\Traduttore\Project. */ class Project extends TestCase { - /** - * @var \Required\Traduttore\Tests\GP_Project - */ - protected $gp_project; - /** - * @var \Required\Traduttore\Tests\TraduttoreProject - */ - protected $project; + protected GP_Project $gp_project; + + protected TraduttoreProject $project; public function setUp(): void { parent::setUp(); diff --git a/tests/phpunit/tests/Runner.php b/tests/phpunit/tests/Runner.php index 6deadfa..0c0c022 100644 --- a/tests/phpunit/tests/Runner.php +++ b/tests/phpunit/tests/Runner.php @@ -14,20 +14,11 @@ * Test cases for \Required\Traduttore\Runner. */ class Runner extends TestCase { - /** - * @var \Required\Traduttore\Tests\Project - */ - protected $project; - - /** - * @var \Required\Traduttore\Tests\R - */ - protected $runner; - - /** - * @var \Required\Traduttore\Loader - */ - protected $loader; + protected Project $project; + + protected R $runner; + + protected Loader $loader; public function setUp(): void { parent::setUp(); diff --git a/tests/phpunit/tests/TestCase.php b/tests/phpunit/tests/TestCase.php index 351688c..c0c3619 100644 --- a/tests/phpunit/tests/TestCase.php +++ b/tests/phpunit/tests/TestCase.php @@ -7,6 +7,7 @@ use GP_UnitTest_Factory; use GP_UnitTestCase; +use WP_Error; use WP_REST_Response; /** diff --git a/tests/phpunit/tests/Updater.php b/tests/phpunit/tests/Updater.php index fd73101..0a1475d 100644 --- a/tests/phpunit/tests/Updater.php +++ b/tests/phpunit/tests/Updater.php @@ -14,15 +14,9 @@ * Test cases for \Required\Traduttore\Updater. */ class Updater extends TestCase { - /** - * @var \Required\Traduttore\Tests\Project - */ - protected $project; - - /** - * @var \Required\Traduttore\Tests\U - */ - protected $updater; + protected Project $project; + + protected U $updater; public function setUp(): void { parent::setUp();