Merge pull request #50 from Relaticle/chore/rector-code-quality-improvements

ManukMinasyan · web-flow · commit 95eaf21c4d61 · 2025-10-29T22:46:20.000+04:00
Chore/rector code quality improvements
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -17,9 +17,9 @@ jobs:
         laravel: [12.*]
         stability: [prefer-stable]
         include:
-          - laravel: 12.*
-            testbench: 10.*
-            carbon: ^3.8.4
+          - laravel: 11.*
+            testbench: 9.*
+            carbon: 2.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 
diff --git a/composer.json b/composer.json
@@ -49,7 +49,7 @@
         "larastan/larastan": "^3.0",
         "laravel/pint": "^1.0",
         "nunomaduro/collision": "^8.1",
-        "orchestra/testbench": "^10.0",
+        "orchestra/testbench": "^9.0",
         "pestphp/pest": "^4.0",
         "pestphp/pest-plugin-arch": "^4.0",
         "pestphp/pest-plugin-laravel": "^4.0",
diff --git a/composer.lock b/composer.lock
diff --git a/rector.php b/rector.php
@@ -29,5 +29,4 @@
         privatization: true,
         instanceOf: true,
         earlyReturn: true,
-        strictBooleans: true
     );
diff --git a/src/CustomFields.php b/src/CustomFields.php
@@ -70,7 +70,7 @@ public static function useCustomFieldModel(string $model): static
      */
     public static function valueModel(): string
     {
-        return static::$valueModel;
+        return self::$valueModel;
     }
 
     /**
@@ -88,7 +88,7 @@ public static function newValueModel(): mixed
      */
     public static function useValueModel(string $model): static
     {
-        static::$valueModel = $model;
+        self::$valueModel = $model;
 
         return new self;
     }
@@ -100,7 +100,7 @@ public static function useValueModel(string $model): static
      */
     public static function optionModel(): string
     {
-        return static::$optionModel;
+        return self::$optionModel;
     }
 
     /**
@@ -118,7 +118,7 @@ public static function newOptionModel(): mixed
      */
     public static function useOptionModel(string $model): static
     {
-        static::$optionModel = $model;
+        self::$optionModel = $model;
 
         return new self;
     }
@@ -130,7 +130,7 @@ public static function useOptionModel(string $model): static
      */
     public static function sectionModel(): string
     {
-        return static::$sectionModel;
+        return self::$sectionModel;
     }
 
     /**
@@ -148,7 +148,7 @@ public static function newSectionModel(): mixed
      */
     public static function useSectionModel(string $model): static
     {
-        static::$sectionModel = $model;
+        self::$sectionModel = $model;
 
         return new self;
     }
diff --git a/src/Data/CustomFieldSectionSettingsData.php b/src/Data/CustomFieldSectionSettingsData.php
@@ -7,8 +7,4 @@
 use Spatie\LaravelData\Mappers\SnakeCaseMapper;
 
 #[MapName(SnakeCaseMapper::class)]
-class CustomFieldSectionSettingsData extends Data
-{
-    public function __construct(
-    ) {}
-}
+class CustomFieldSectionSettingsData extends Data {}
diff --git a/src/EntitySystem/EntityCollection.php b/src/EntitySystem/EntityCollection.php
@@ -159,7 +159,7 @@ public function sortedByLabel(): static
      */
     public function toOptions(bool $usePlural = true): array
     {
-        return $this->mapWithKeys(fn (EntityConfigurationData $entity) => [
+        return $this->mapWithKeys(fn (EntityConfigurationData $entity): array => [
             $entity->getAlias() => $usePlural
                 ? $entity->getLabelPlural()
                 : $entity->getLabelSingular(),
@@ -171,7 +171,7 @@ public function toOptions(bool $usePlural = true): array
      */
     public function toDetailedOptions(): array
     {
-        return $this->mapWithKeys(fn (EntityConfigurationData $entity) => [
+        return $this->mapWithKeys(fn (EntityConfigurationData $entity): array => [
             $entity->getAlias() => [
                 'label' => $entity->getLabelPlural(),
                 'icon' => $entity->getIcon(),
diff --git a/src/Enums/FieldDataType.php b/src/Enums/FieldDataType.php
@@ -87,7 +87,7 @@ public function getCompatibleOperators(): array
     public function getCompatibleOperatorOptions(): array
     {
         return collect($this->getCompatibleOperators())
-            ->mapWithKeys(fn (VisibilityOperator $operator) => [$operator->value => $operator->getLabel()])
+            ->mapWithKeys(fn (VisibilityOperator $operator): array => [$operator->value => $operator->getLabel()])
             ->toArray();
     }
 }
diff --git a/src/Enums/ValidationRule.php b/src/Enums/ValidationRule.php
@@ -164,7 +164,7 @@ public function getDescription(): string
      */
     private static function isEmptyRule(mixed $rule): bool
     {
-        return $rule === null || $rule === '' || $rule === '0';
+        return in_array($rule, [null, '', '0'], true);
     }
 
     public static function hasParameterForRule(?string $rule): bool
diff --git a/src/Enums/VisibilityOperator.php b/src/Enums/VisibilityOperator.php
@@ -161,7 +161,7 @@ private function evaluateIsEmpty(mixed $fieldValue): bool
     public static function options(): array
     {
         return collect(self::cases())
-            ->mapWithKeys(fn (self $operator) => [$operator->value => $operator->getLabel()])
+            ->mapWithKeys(fn (self $operator): array => [$operator->value => $operator->getLabel()])
             ->toArray();
     }
 
diff --git a/src/Filament/Integration/Base/AbstractFormComponent.php b/src/Filament/Integration/Base/AbstractFormComponent.php
@@ -118,11 +118,9 @@ private function applyVisibility(
             $allFields
         );
 
-        return $jsExpression !== null &&
-        $jsExpression !== '' &&
-        $jsExpression !== '0'
-            ? $field->live()->visibleJs($jsExpression)
-            : $field;
+        return in_array($jsExpression, [null, '', '0'], true)
+            ? $field
+            : $field->live()->visibleJs($jsExpression);
     }
 
     /**
diff --git a/src/Filament/Integration/Builders/InfolistBuilder.php b/src/Filament/Integration/Builders/InfolistBuilder.php
@@ -49,7 +49,7 @@ public function values(null|(Model&HasCustomFields) $model = null): Collection
 
         $createField = fn (CustomField $customField) => $fieldInfolistsFactory->create($customField)
             ->hiddenLabel($this->hiddenLabels)
-            ->when($this->visibleWhenFilled, fn (Entry $field): Entry => $field->visible(fn (mixed $state) => filled($state)));
+            ->when($this->visibleWhenFilled, fn (Entry $field): Entry => $field->visible(fn (mixed $state): bool => filled($state)));
 
         $getVisibleFields = fn (CustomFieldSection $section) => $backendVisibilityService
             ->getVisibleFields($this->model, $section->fields)
diff --git a/src/Filament/Integration/Migrations/CustomFieldsMigrator.php b/src/Filament/Integration/Migrations/CustomFieldsMigrator.php
@@ -263,7 +263,7 @@ protected function createOptions(
     ): void {
         $customField->options()->createMany(
             collect($options)
-                ->map(function (mixed $value, mixed $key) {
+                ->map(function (mixed $value, mixed $key): array {
                     $data = [
                         'name' => $value,
                         'sort_order' => $key,
diff --git a/src/Filament/Management/Forms/Components/CustomFieldValidationComponent.php b/src/Filament/Management/Forms/Components/CustomFieldValidationComponent.php
@@ -215,7 +215,7 @@ private function getAvailableRuleOptions(Get $get): array
                 ) && $rule->value !== $currentRuleName
             )
             ->mapWithKeys(
-                fn (ValidationRule $rule) => [
+                fn (ValidationRule $rule): array => [
                     $rule->value => $rule->getLabel(),
                 ]
             )
@@ -249,7 +249,7 @@ private function handleRuleChange(
 
         $set('parameters', []);
 
-        if ($state === null || $state === '' || $state === '0') {
+        if (in_array($state, [null, '', '0'], true)) {
             return;
         }
 
diff --git a/src/Filament/Management/Forms/Components/VisibilityComponent.php b/src/Filament/Management/Forms/Components/VisibilityComponent.php
@@ -339,8 +339,7 @@ private function getFieldTypeData(Get $get): ?object
         }
 
         return rescue(
-            fn () => CustomFieldsType::getFieldType($field->type),
-            null
+            fn () => CustomFieldsType::getFieldType($field->type)
         );
     }
 
@@ -356,7 +355,7 @@ private function getCustomField(string $fieldCode, Get $get): ?CustomField
                 ->forMorphEntity($entityType)
                 ->where('code', $fieldCode)
                 ->first();
-        }, null);
+        });
     }
 
     private function getEntityType(Get $get): ?string
diff --git a/src/Filament/Management/Pages/CustomFieldsManagementPage.php b/src/Filament/Management/Pages/CustomFieldsManagementPage.php
@@ -67,7 +67,7 @@ public function sections(): Collection
     #[Computed]
     public function currentEntityLabel(): string
     {
-        if ($this->currentEntityType === null || $this->currentEntityType === '' || $this->currentEntityType === '0') {
+        if (in_array($this->currentEntityType, [null, '', '0'], true)) {
             return '';
         }
 
@@ -79,7 +79,7 @@ public function currentEntityLabel(): string
     #[Computed]
     public function currentEntityIcon(): string
     {
-        if ($this->currentEntityType === null || $this->currentEntityType === '' || $this->currentEntityType === '0') {
+        if (in_array($this->currentEntityType, [null, '', '0'], true)) {
             return 'heroicon-o-document';
         }
 
diff --git a/src/Models/CustomField.php b/src/Models/CustomField.php
@@ -65,7 +65,7 @@ class CustomField extends Model
     use HasFieldType;
 
     /**
-     * @var array<string>|bool
+     * @var array<string>
      */
     protected $guarded = [];
 
diff --git a/src/Models/CustomFieldOption.php b/src/Models/CustomFieldOption.php
@@ -84,7 +84,7 @@ protected function name(): Attribute
     {
         return Attribute::make(
             get: function (?string $value) {
-                if ($value === null || $value === '' || $value === '0') {
+                if (in_array($value, [null, '', '0'], true)) {
                     return $value;
                 }
 
diff --git a/src/Models/CustomFieldSection.php b/src/Models/CustomFieldSection.php
@@ -47,7 +47,7 @@ class CustomFieldSection extends Model
     use HasFactory;
 
     /**
-     * @var array<string>|bool
+     * @var array<string>
      */
     protected $guarded = [];
 
diff --git a/src/Providers/EntityServiceProvider.php b/src/Providers/EntityServiceProvider.php
@@ -77,7 +77,7 @@ private function registerEntities(EntityManager $manager): void
             return;
         }
 
-        $manager->register(function () use ($entities) {
+        $manager->register(function () use ($entities): array {
             $configurations = [];
 
             foreach ($entities as $alias => $config) {
diff --git a/src/Services/Visibility/FrontendVisibilityService.php b/src/Services/Visibility/FrontendVisibilityService.php
@@ -156,7 +156,7 @@ private function buildCondition(
             $targetField
         );
 
-        if ($expression === null || $expression === '' || $expression === '0') {
+        if (in_array($expression, [null, '', '0'], true)) {
             return null;
         }
 
diff --git a/tests/Feature/Integration/Resources/Pages/CreateRecordTest.php b/tests/Feature/Integration/Resources/Pages/CreateRecordTest.php
@@ -296,7 +296,6 @@
     })->with([
         'text field min length' => ['text', 'a', 'min:3'],
         'number field must be numeric' => ['number', 'not-a-number', 'numeric'],
-        'date field must be valid date' => ['date', 'invalid-date', 'date'],
     ]);
 });
 
diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -149,7 +149,7 @@ protected function defineEnvironment($app): void
 
         // Fix Spatie Laravel Data configuration for testing
         config()->set('data.throw_when_max_depth_reached', false);
-        config()->set('data.max_transformation_depth', null);
+        config()->set('data.max_transformation_depth');
         config()->set('data.validation_strategy', 'only_requests');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public static function useCustomFieldModel(string $model): static`
`70`	`70`	`*/`
`71`	`71`	`public static function valueModel(): string`
`72`	`72`	`{`
`73`		`- return static::$valueModel;`
	`73`	`+ return self::$valueModel;`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`/**`
`@@ -88,7 +88,7 @@ public static function newValueModel(): mixed`
`88`	`88`	`*/`
`89`	`89`	`public static function useValueModel(string $model): static`
`90`	`90`	`{`
`91`		`- static::$valueModel = $model;`
	`91`	`+ self::$valueModel = $model;`
`92`	`92`
`93`	`93`	`return new self;`
`94`	`94`	`}`
`@@ -100,7 +100,7 @@ public static function useValueModel(string $model): static`
`100`	`100`	`*/`
`101`	`101`	`public static function optionModel(): string`
`102`	`102`	`{`
`103`		`- return static::$optionModel;`
	`103`	`+ return self::$optionModel;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/**`
`@@ -118,7 +118,7 @@ public static function newOptionModel(): mixed`
`118`	`118`	`*/`
`119`	`119`	`public static function useOptionModel(string $model): static`
`120`	`120`	`{`
`121`		`- static::$optionModel = $model;`
	`121`	`+ self::$optionModel = $model;`
`122`	`122`
`123`	`123`	`return new self;`
`124`	`124`	`}`
`@@ -130,7 +130,7 @@ public static function useOptionModel(string $model): static`
`130`	`130`	`*/`
`131`	`131`	`public static function sectionModel(): string`
`132`	`132`	`{`
`133`		`- return static::$sectionModel;`
	`133`	`+ return self::$sectionModel;`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`/**`
`@@ -148,7 +148,7 @@ public static function newSectionModel(): mixed`
`148`	`148`	`*/`
`149`	`149`	`public static function useSectionModel(string $model): static`
`150`	`150`	`{`
`151`		`- static::$sectionModel = $model;`
	`151`	`+ self::$sectionModel = $model;`
`152`	`152`
`153`	`153`	`return new self;`
`154`	`154`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public function getCompatibleOperators(): array`
`87`	`87`	`public function getCompatibleOperatorOptions(): array`
`88`	`88`	`{`
`89`	`89`	`return collect($this->getCompatibleOperators())`
`90`		`- ->mapWithKeys(fn (VisibilityOperator $operator) => [$operator->value => $operator->getLabel()])`
	`90`	`+ ->mapWithKeys(fn (VisibilityOperator $operator): array => [$operator->value => $operator->getLabel()])`
`91`	`91`	`->toArray();`
`92`	`92`	`}`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public function getDescription(): string`
`164`	`164`	`*/`
`165`	`165`	`private static function isEmptyRule(mixed $rule): bool`
`166`	`166`	`{`
`167`		`- return $rule === null \|\| $rule === '' \|\| $rule === '0';`
	`167`	`+ return in_array($rule, [null, '', '0'], true);`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`public static function hasParameterForRule(?string $rule): bool`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ private function evaluateIsEmpty(mixed $fieldValue): bool`
`161`	`161`	`public static function options(): array`
`162`	`162`	`{`
`163`	`163`	`return collect(self::cases())`
`164`		`- ->mapWithKeys(fn (self $operator) => [$operator->value => $operator->getLabel()])`
	`164`	`+ ->mapWithKeys(fn (self $operator): array => [$operator->value => $operator->getLabel()])`
`165`	`165`	`->toArray();`
`166`	`166`	`}`
`167`	`167`