Merge pull request #920 from xHeaven/patch-1

General code health improvements

src/Attributes/Validation/Exclude.php

@@ -9,13 +9,13 @@
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Exclude extends ObjectValidationAttribute
 {
-    public function __construct(protected ExcludeIf $rule)
+    public function __construct(protected ?ExcludeIf $rule = null)
     {
     }
 
     public function getRule(ValidationPath $path): object|string
     {
-        return $this->rule;
+        return $this->rule ?? self::keyword();
     }
 
     public static function keyword(): string

src/Attributes/Validation/ValidationAttribute.php

@@ -46,11 +46,11 @@ protected static function parseBooleanValue(mixed $value): mixed
         }
 
         if ($value === 'true' || $value === '1') {
-            return true;
+            return 'true';
         }
 
         if ($value === 'false' || $value === '0') {
-            return true;
+            return 'false';
         }
 
         return $value;

src/Casts/UnserializeCast.php

@@ -8,7 +8,7 @@
 class UnserializeCast implements Cast
 {
     public function __construct(
-        private bool $failSilently = false,
+        private readonly bool $failSilently = false,
     ) {
     }
 

src/Commands/DataMakeCommand.php

@@ -39,7 +39,7 @@ protected function qualifyClass($name): string
     {
         $suffix = trim($this->option('suffix'));
         if (! empty($suffix) && ! Str::endsWith($name, $suffix)) {
-            $name = $name . $suffix;
+            $name .= $suffix;
         }
 
         return parent::qualifyClass($name);

src/Concerns/ValidateableData.php

@@ -41,7 +41,6 @@ public static function validateAndCreate(Arrayable|array $payload): static
 
     public static function withValidator(Validator $validator): void
     {
-        return;
     }
 
     public static function getValidationRules(array $payload): array

src/DataPipes/CastPropertiesDataPipe.php

@@ -129,7 +129,7 @@ protected function cast(
 
     protected function shouldBeCasted(DataProperty $property, mixed $value): bool
     {
-        if (gettype($value) !== 'object') {
+        if (!is_object($value)) {
             return true;
         }
 

src/DataPipes/DefaultValuesDataPipe.php

@@ -33,8 +33,6 @@ public function handle(
 
             if ($property->type->isNullable) {
                 $properties[$name] = null;
-
-                continue;
             }
         }
 

src/Exceptions/CannotPerformPartialOnDataField.php

@@ -19,7 +19,7 @@ public static function create(
     ): self {
         $message = "Tried to {$partialType->getVerb()} a non existing field `{$field}` on `{$dataClass->name}`.".PHP_EOL;
         $message .= 'Provided transformation context:'.PHP_EOL.PHP_EOL;
-        $message .= (string) $transformationContext;
+        $message .= $transformationContext;
 
         return new self(message: $message, previous: $exception);
     }

src/Resolvers/DataValidationMessagesAndAttributesResolver.php

@@ -45,8 +45,9 @@ public function execute(
                     [...$nestingChain, $dataProperty->type->dataClass],
                 );
 
-                $messages = array_merge($messages, $nested['messages']);
-                $attributes = array_merge($attributes, $nested['attributes']);
+
+                $messages[] = $nested['messages'];
+                $attributes[] = $nested['attributes'];
 
                 continue;
             }
@@ -63,13 +64,14 @@ public function execute(
                     [...$nestingChain, $dataProperty->type->dataClass],
                 );
 
-                $messages = array_merge($messages, $collected['messages']);
-                $attributes = array_merge($attributes, $collected['attributes']);
-
-                continue;
+                $messages[] = $collected['messages'];
+                $attributes[] = $collected['attributes'];
             }
         }
 
+        $messages = array_merge(...$messages);
+        $attributes = array_merge(...$attributes);
+
         if (method_exists($class, 'messages')) {
             $messages = collect(app()->call([$class, 'messages']))
                 ->keyBy(

src/Resolvers/EmptyDataResolver.php

@@ -34,7 +34,7 @@ public function execute(string $class, array $extra = []): array
         return $payload;
     }
 
-    protected function getValueForProperty(DataProperty $property): mixed
+    protected function getValueForProperty(DataProperty $property): ?array
     {
         $propertyType = $property->type;
 

src/Resolvers/RequestQueryStringPartialsResolver.php

@@ -151,10 +151,6 @@ protected function findField(
 
         $outputMappedProperties = $dataClass->outputMappedProperties->resolve();
 
-        if (array_key_exists($field, $outputMappedProperties)) {
-            return $outputMappedProperties[$field];
-        }
-
-        return null;
+        return $outputMappedProperties[$field] ?? null;
     }
 }

src/Support/Caching/DataStructureCache.php

@@ -27,9 +27,7 @@ public function getConfig(): ?CachedDataConfig
         /** @var ?CachedDataConfig $cachedConfig */
         $cachedConfig = $this->get('config');
 
-        if ($cachedConfig) {
-            $cachedConfig->setCache($this);
-        }
+        $cachedConfig?->setCache($this);
 
         return $cachedConfig;
     }

src/Support/Creation/CreationContext.php

@@ -79,7 +79,7 @@ public function next(
     ): self {
         $this->dataClass = $dataClass;
 
-        array_push($this->currentPath, $path);
+        $this->currentPath[] = $path;
 
         return $this;
     }

src/Support/DataConfig.php

@@ -15,7 +15,7 @@ public static function createFromConfig(array $config): static
         $dataClasses = [];
 
         $ruleInferrers = array_map(
-            fn (string $ruleInferrerClass) => app($ruleInferrerClass),
+            app(...),
             $config['rule_inferrers'] ?? []
         );
 

src/Support/EloquentCasts/DataEloquentCast.php

@@ -74,7 +74,6 @@ public function set($model, string $key, $value, array $attributes): ?string
                 'data' => json_decode($value->toJson(), associative: true, flags: JSON_THROW_ON_ERROR),
             ])
             : $value->toJson();
-        ;
 
         if (in_array('encrypted', $this->arguments)) {
             return Crypt::encryptString($value);

src/Support/Partials/Partial.php

@@ -90,7 +90,7 @@ protected static function resolveSegmentsFromPath(string $path): array
                     substr($segmentString, 1, -1)
                 );
 
-                $segments[] = new FieldsPartialSegment(array_map(fn (string $field) => trim($field), $fields));
+                $segments[] = new FieldsPartialSegment(array_map(trim(...), $fields));
 
                 return $segments;
             }

src/Support/Transformation/GlobalTransformersCollection.php

@@ -26,7 +26,7 @@ public function add(string $transformable, Transformer $transformer): self
 
     public function findTransformerForValue(mixed $value): ?Transformer
     {
-        if (gettype($value) !== 'object') {
+        if (!is_object($value)) {
             return $this->transformers[get_debug_type($value)] ?? null;
         }