From fc0948a3ce6fc23f14a36b73ff6d2312d1acb481 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Dadashi Date: Fri, 19 Jan 2024 08:05:41 +0330 Subject: [PATCH] fix phpstan errors --- phpstan-baseline.php | 31 +++----------------------- src/Commands/Hmac.php | 4 ++-- src/Commands/Setup.php | 4 ++-- src/Commands/User.php | 4 ++-- tests/Authentication/MagicLinkTest.php | 4 ++-- tests/Controllers/MagicLinkTest.php | 2 +- 6 files changed, 12 insertions(+), 37 deletions(-) diff --git a/phpstan-baseline.php b/phpstan-baseline.php index dd4fafb64..c9817e23f 100644 --- a/phpstan-baseline.php +++ b/phpstan-baseline.php @@ -158,16 +158,6 @@ 'count' => 1, 'path' => __DIR__ . '/src/Collectors/Auth.php', ]; -$ignoreErrors[] = [ - 'message' => '#^PHPDoc type array\\ of property CodeIgniter\\\\Shield\\\\Commands\\\\Generators\\\\UserModelGenerator\\:\\:\\$arguments is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$arguments\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/src/Commands/Generators/UserModelGenerator.php', -]; -$ignoreErrors[] = [ - 'message' => '#^PHPDoc type array\\ of property CodeIgniter\\\\Shield\\\\Commands\\\\Generators\\\\UserModelGenerator\\:\\:\\$options is not the same as PHPDoc type array of overridden property CodeIgniter\\\\CLI\\\\BaseCommand\\:\\:\\$options\\.$#', - 'count' => 1, - 'path' => __DIR__ . '/src/Commands/Generators/UserModelGenerator.php', -]; $ignoreErrors[] = [ 'message' => '#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#', 'count' => 1, @@ -317,28 +307,13 @@ 'path' => __DIR__ . '/src/Models/UserModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$data \\(array\\|CodeIgniter\\\\Shield\\\\Entities\\\\User\\) of method CodeIgniter\\\\Shield\\\\Models\\\\UserModel\\:\\:insert\\(\\) should be contravariant with parameter \\$data \\(array\\|object\\|null\\) of method CodeIgniter\\\\Model\\:\\:insert\\(\\)$#', - 'count' => 1, - 'path' => __DIR__ . '/src/Models/UserModel.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Parameter \\#1 \\$data \\(array\\|CodeIgniter\\\\Shield\\\\Entities\\\\User\\) of method CodeIgniter\\\\Shield\\\\Models\\\\UserModel\\:\\:save\\(\\) should be contravariant with parameter \\$data \\(array\\|object\\) of method CodeIgniter\\\\BaseModel\\:\\:save\\(\\)$#', - 'count' => 1, - 'path' => __DIR__ . '/src/Models/UserModel.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Parameter \\#2 \\$data \\(array\\|CodeIgniter\\\\Shield\\\\Entities\\\\User\\) of method CodeIgniter\\\\Shield\\\\Models\\\\UserModel\\:\\:update\\(\\) should be contravariant with parameter \\$data \\(array\\|object\\|null\\) of method CodeIgniter\\\\Model\\:\\:update\\(\\)$#', - 'count' => 1, - 'path' => __DIR__ . '/src/Models/UserModel.php', -]; -$ignoreErrors[] = [ - 'message' => '#^Return type \\(int\\|string\\|true\\) of method CodeIgniter\\\\Shield\\\\Models\\\\UserModel\\:\\:insert\\(\\) should be covariant with return type \\(int\\|object\\|string\\|false\\) of method CodeIgniter\\\\Model\\:\\:insert\\(\\)$#', + 'message' => '#^Call to function model with CodeIgniter\\\\Shield\\\\Models\\\\UserIdentityModel\\:\\:class is discouraged\\.$#', 'count' => 1, 'path' => __DIR__ . '/src/Models/UserModel.php', ]; $ignoreErrors[] = [ - 'message' => '#^Call to function model with CodeIgniter\\\\Shield\\\\Models\\\\UserIdentityModel\\:\\:class is discouraged\\.$#', - 'count' => 1, + 'message' => '#^Return type \\(int|string|true\\) of method CodeIgniter\\\\Shield\\\\Models\\\\UserModel\\:\\:insert\\(\\) should be covariant with return type \\(\\(\\$returnID is true \\? int|string|false \\: bool\\) of method CodeIgniter\\\\Model\\:\\:insert\\(\\)\\$#', + 'count' => 4, 'path' => __DIR__ . '/src/Models/UserModel.php', ]; $ignoreErrors[] = [ diff --git a/src/Commands/Hmac.php b/src/Commands/Hmac.php index 2071790f5..08fdcb7d8 100644 --- a/src/Commands/Hmac.php +++ b/src/Commands/Hmac.php @@ -54,7 +54,7 @@ class Hmac extends BaseCommand /** * the Command's Arguments * - * @var array + * @var array */ protected $arguments = [ 'action' => <<<'EOL' @@ -72,7 +72,7 @@ class Hmac extends BaseCommand /** * the Command's Options * - * @var array + * @var array */ protected $options = []; diff --git a/src/Commands/Setup.php b/src/Commands/Setup.php index 45b105e47..9d6e629cf 100644 --- a/src/Commands/Setup.php +++ b/src/Commands/Setup.php @@ -47,14 +47,14 @@ class Setup extends BaseCommand /** * the Command's Arguments * - * @var array + * @var array */ protected $arguments = []; /** * the Command's Options * - * @var array + * @var array */ protected $options = [ '-f' => 'Force overwrite ALL existing files in destination.', diff --git a/src/Commands/User.php b/src/Commands/User.php index c5ef8513c..1a894d7f3 100644 --- a/src/Commands/User.php +++ b/src/Commands/User.php @@ -86,7 +86,7 @@ class User extends BaseCommand /** * Command's Arguments * - * @var array + * @var array */ protected $arguments = [ 'action' => <<<'EOL' @@ -107,7 +107,7 @@ class User extends BaseCommand /** * Command's Options * - * @var array + * @var array */ protected $options = [ '-i' => 'User id', diff --git a/tests/Authentication/MagicLinkTest.php b/tests/Authentication/MagicLinkTest.php index f8426604a..38dbe6525 100644 --- a/tests/Authentication/MagicLinkTest.php +++ b/tests/Authentication/MagicLinkTest.php @@ -114,7 +114,7 @@ public function testMagicLinkVerifyExpired(): void 'user_id' => $user->id, 'type' => Session::ID_TYPE_MAGIC_LINK, 'secret' => 'abasdasdf', - 'expires' => Time::now()->subDays(5), + 'expires' => Time::now()->subDays(5)->format('Y-m-d H:i:s'), ]); $result = $this->get(route_to('verify-magic-link') . '?token=abasdasdf'); @@ -136,7 +136,7 @@ public function testMagicLinkVerifySuccess(): void 'user_id' => $user->id, 'type' => Session::ID_TYPE_MAGIC_LINK, 'secret' => 'abasdasdf', - 'expires' => Time::now()->addMinutes(60), + 'expires' => Time::now()->addMinutes(60)->format('Y-m-d H:i:s'), ]); $result = $this->get(route_to('verify-magic-link') . '?token=abasdasdf'); diff --git a/tests/Controllers/MagicLinkTest.php b/tests/Controllers/MagicLinkTest.php index 477c98248..11f82db87 100644 --- a/tests/Controllers/MagicLinkTest.php +++ b/tests/Controllers/MagicLinkTest.php @@ -103,7 +103,7 @@ public function testMagicLinkVerifyPendingRegistrationActivation(): void 'user_id' => $user->id, 'type' => Session::ID_TYPE_MAGIC_LINK, 'secret' => 'abasdasdf', - 'expires' => Time::now()->addMinutes(60), + 'expires' => Time::now()->addMinutes(60)->format('Y-m-d H:i:s'), ]); $result = $this->get(route_to('verify-magic-link') . '?token=abasdasdf');