From f15cc373969f6fc4af3cab2ca320eac35b2ea45f Mon Sep 17 00:00:00 2001 From: Rayiumir Date: Wed, 29 Oct 2025 17:33:56 +0330 Subject: [PATCH] refactor(types): add full PHP 8.4 type declarations across all classes --- src/Facades/Verta.php | 2 +- src/Laravel/JalaliValidator.php | 34 +++++++++++++-------------- src/Laravel/VertaServiceProvider.php | 10 ++++---- tests/Laravel/JalaliValidatorTest.php | 6 ++--- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Facades/Verta.php b/src/Facades/Verta.php index d12dc46..1abb102 100644 --- a/src/Facades/Verta.php +++ b/src/Facades/Verta.php @@ -11,7 +11,7 @@ class Verta extends Facade * * @return string */ - protected static function getFacadeAccessor() + protected static function getFacadeAccessor(): string { return 'verta'; } diff --git a/src/Laravel/JalaliValidator.php b/src/Laravel/JalaliValidator.php index 92ed578..a62822c 100644 --- a/src/Laravel/JalaliValidator.php +++ b/src/Laravel/JalaliValidator.php @@ -14,7 +14,7 @@ class JalaliValidator * @param array $parameters * @return bool */ - public function validateDate($attribute, $value, $parameters) + public function validateDate($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -55,7 +55,7 @@ public function validateDateMultiFormat(string $attribute, string $value, array * @param array $parameters * @return bool */ - public function validateDateEqual($attribute, $value, $parameters) + public function validateDateEqual($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -79,7 +79,7 @@ public function validateDateEqual($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateNotEqual($attribute, $value, $parameters) + public function validateDateNotEqual($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -102,7 +102,7 @@ public function validateDateNotEqual($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateTime($attribute, $value, $parameters) + public function validateDateTime($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -127,7 +127,7 @@ public function validateDateTime($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateTimeEqual($attribute, $value, $parameters) + public function validateDateTimeEqual($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -151,7 +151,7 @@ public function validateDateTimeEqual($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateTimeNotEqual($attribute, $value, $parameters) + public function validateDateTimeNotEqual($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -175,7 +175,7 @@ public function validateDateTimeNotEqual($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateAfter($attribute, $value, $parameters) + public function validateDateAfter($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -199,7 +199,7 @@ public function validateDateAfter($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateAfterEqual($attribute, $value, $parameters) + public function validateDateAfterEqual($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -223,7 +223,7 @@ public function validateDateAfterEqual($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateTimeAfter($attribute, $value, $parameters) + public function validateDateTimeAfter($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -247,7 +247,7 @@ public function validateDateTimeAfter($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateTimeAfterEqual($attribute, $value, $parameters) + public function validateDateTimeAfterEqual($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -271,7 +271,7 @@ public function validateDateTimeAfterEqual($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateBefore($attribute, $value, $parameters) + public function validateDateBefore($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -295,7 +295,7 @@ public function validateDateBefore($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateBeforeEqual($attribute, $value, $parameters) + public function validateDateBeforeEqual($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -319,7 +319,7 @@ public function validateDateBeforeEqual($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateTimeBefore($attribute, $value, $parameters) + public function validateDateTimeBefore($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -343,7 +343,7 @@ public function validateDateTimeBefore($attribute, $value, $parameters) * @param array $parameters * @return bool */ - public function validateDateTimeBeforeEqual($attribute, $value, $parameters) + public function validateDateTimeBeforeEqual($attribute, $value, $parameters): bool { if (!is_string($value)) { return false; @@ -367,7 +367,7 @@ public function validateDateTimeBeforeEqual($attribute, $value, $parameters) * @param $parameters * @return string */ - public function replaceDateOrDatetime($message, $attribute, $rule, $parameters) + public function replaceDateOrDatetime($message, $attribute, $rule, $parameters): string { return $message; } @@ -380,7 +380,7 @@ public function replaceDateOrDatetime($message, $attribute, $rule, $parameters) * @param $parameters * @return string */ - public function replaceDateAfterOrBeforeOrEqual($message, $attribute, $rule, $parameters) + public function replaceDateAfterOrBeforeOrEqual($message, $attribute, $rule, $parameters): string { $format = count($parameters) > 1 ? $parameters[1] : 'Y/m/d'; $date = count($parameters) ? $parameters[0] : Verta::instance()->format($format); @@ -401,7 +401,7 @@ public function replaceDateAfterOrBeforeOrEqual($message, $attribute, $rule, $pa * @param $parameters * @return string */ - public function replaceDateTimeAfterOrBeforeOrEqual($message, $attribute, $rule, $parameters) + public function replaceDateTimeAfterOrBeforeOrEqual($message, $attribute, $rule, $parameters): string { $format = count($parameters) > 1 ? $parameters[1] : 'Y/m/d H:i:s'; $date = count($parameters) ? $parameters[0] : Verta::instance()->format($format); diff --git a/src/Laravel/VertaServiceProvider.php b/src/Laravel/VertaServiceProvider.php index 4b668d0..db1b7f6 100644 --- a/src/Laravel/VertaServiceProvider.php +++ b/src/Laravel/VertaServiceProvider.php @@ -9,7 +9,7 @@ class VertaServiceProvider extends ServiceProvider { - private $rules = [ + private array $rules = [ 'jdate' => [ 'extend' => 'validateDate', 'replacer' => 'replaceDateOrDatetime', @@ -77,7 +77,7 @@ class VertaServiceProvider extends ServiceProvider * * @return void */ - public function boot() + public function boot(): void { $this->loadValidators(); @@ -91,7 +91,7 @@ public function boot() * * @return void */ - public function register() + public function register(): void { $this->app->bind('verta', function ($app) { return new Verta(); @@ -103,12 +103,12 @@ public function register() * * @return array */ - public function provides() + public function provides(): array { return ['verta']; } - public function loadValidators() + public function loadValidators(): void { $className = JalaliValidator::class . '@'; diff --git a/tests/Laravel/JalaliValidatorTest.php b/tests/Laravel/JalaliValidatorTest.php index 0864cbc..8d718c5 100644 --- a/tests/Laravel/JalaliValidatorTest.php +++ b/tests/Laravel/JalaliValidatorTest.php @@ -80,7 +80,7 @@ public function validateDateNotEqual() /*** * provider for tests */ - public static function correctDateFormatProvider() + public static function correctDateFormatProvider(): array { return [ [ @@ -112,7 +112,7 @@ public static function correctDateFormatProvider() /** * provider for tests */ - public static function incorrectDateFormatProvider() + public static function incorrectDateFormatProvider(): array { return [ [ @@ -133,7 +133,7 @@ public static function incorrectDateFormatProvider() /** * provider for tests */ - public static function jalaliValidatorMethods() + public static function jalaliValidatorMethods(): array { return [ ["validateDate"],