Skip to content

Refactor(types): Add full PHP 8.4 type declarations across all classes #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rayiumir wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Refactor(types): Add full PHP 8.4 type declarations across all classes #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Facades/Verta.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class Verta extends Facade
*
* @return string
*/
protected static function getFacadeAccessor()
protected static function getFacadeAccessor(): string
{
return 'verta';
}
Expand Down
34 changes: 17 additions & 17 deletions src/Laravel/JalaliValidator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}
Expand All @@ -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);
Expand All @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions src/Laravel/VertaServiceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

class VertaServiceProvider extends ServiceProvider
{
private $rules = [
private array $rules = [
'jdate' => [
'extend' => 'validateDate',
'replacer' => 'replaceDateOrDatetime',
Expand Down Expand Up @@ -77,7 +77,7 @@ class VertaServiceProvider extends ServiceProvider
*
* @return void
*/
public function boot()
public function boot(): void
{
$this->loadValidators();

Expand All @@ -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();
Expand All @@ -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 . '@';

Expand Down
6 changes: 3 additions & 3 deletions tests/Laravel/JalaliValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function validateDateNotEqual()
/***
* provider for tests
*/
public static function correctDateFormatProvider()
public static function correctDateFormatProvider(): array
{
return [
[
Expand Down Expand Up @@ -112,7 +112,7 @@ public static function correctDateFormatProvider()
/**
* provider for tests
*/
public static function incorrectDateFormatProvider()
public static function incorrectDateFormatProvider(): array
{
return [
[
Expand All @@ -133,7 +133,7 @@ public static function incorrectDateFormatProvider()
/**
* provider for tests
*/
public static function jalaliValidatorMethods()
public static function jalaliValidatorMethods(): array
{
return [
["validateDate"],
Expand Down
Loading