Merge branch 'main' of github.com:spatie/laravel-data-resource

rubenvanassche · rubenvanassche · commit 1b7c105deddc · 2024-09-10T15:25:26.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `laravel-data` will be documented in this file.
 
+## 4.8.2 - 2024-08-30
+
+- Remove a circular dependency
+
 ## 4.81 - 2024-08-13
 
 - Fix a missing dependency
diff --git a/docs/as-a-data-transfer-object/request-to-data-object.md b/docs/as-a-data-transfer-object/request-to-data-object.md
@@ -63,7 +63,7 @@ class UpdateSongController
 }
 ```
 
-We have a complete section within these docs dedicated to validation, you can find it [here](/docs/laravel-data/v4/validation).
+We have a complete section within these docs dedicated to validation, you can find it [here](/docs/laravel-data/v4/validation/introduction).
 
 ## Getting the data object filled with request data from anywhere
 
diff --git a/docs/validation/using-validation-attributes.md b/docs/validation/using-validation-attributes.md
@@ -29,7 +29,7 @@ So it is not required to add the `required` and `string` rule, these will be add
 ]
 ```
 
-For each Laravel validation rule we've got a matching validation attribute, you can find a list of them [here](/docs/laravel-data/v4/advanced-usage/using-attributes).
+For each Laravel validation rule we've got a matching validation attribute, you can find a list of them [here](/docs/laravel-data/v4/advanced-usage/validation-attributes).
 
 ## Referencing route parameters
 
diff --git a/src/Attributes/Validation/Dimensions.php b/src/Attributes/Validation/Dimensions.php
@@ -38,7 +38,7 @@ public function __construct(
 
     public function getRule(ValidationPath $path): object|string
     {
-        if($this->rule) {
+        if ($this->rule) {
             return $this->rule;
         }
 
diff --git a/src/Attributes/Validation/Exists.php b/src/Attributes/Validation/Exists.php
@@ -28,7 +28,7 @@ public function __construct(
 
     public function getRule(ValidationPath $path): object|string
     {
-        if($this->rule) {
+        if ($this->rule) {
             return $this->rule;
         }
 
diff --git a/src/Attributes/Validation/NotIn.php b/src/Attributes/Validation/NotIn.php
@@ -22,7 +22,7 @@ public function __construct(array|string|BaseNotIn|RouteParameterReference ...$v
 
     public function getRule(ValidationPath $path): object|string
     {
-        if($this->rule) {
+        if ($this->rule) {
             return $this->rule;
         }
 
diff --git a/src/Attributes/Validation/Unique.php b/src/Attributes/Validation/Unique.php
@@ -30,7 +30,7 @@ public function __construct(
 
     public function getRule(ValidationPath $path): object|string
     {
-        if($this->rule) {
+        if ($this->rule) {
             return $this->rule;
         }
 
diff --git a/src/Casts/EnumerableCast.php b/src/Casts/EnumerableCast.php
@@ -11,11 +11,11 @@ class EnumerableCast implements Cast
 {
     public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): mixed
     {
-        if(config('data.features.cast_and_transform_iterables')) {
+        if (config('data.features.cast_and_transform_iterables')) {
             return Uncastable::create();
         }
 
-        if($property->type->kind->isDataCollectable()) {
+        if ($property->type->kind->isDataCollectable()) {
             return Uncastable::create();
         }
 
diff --git a/src/Casts/UnserializeCast.php b/src/Casts/UnserializeCast.php
@@ -22,7 +22,7 @@ public function cast(DataProperty $property, mixed $value, array $properties, Cr
         try {
             return unserialize($value);
         } catch (\Throwable $e) {
-            if($this->failSilently) {
+            if ($this->failSilently) {
                 return Uncastable::create();
             }
 
diff --git a/src/Commands/DataStructuresCacheCommand.php b/src/Commands/DataStructuresCacheCommand.php
@@ -19,7 +19,7 @@ public function handle(
         DataStructureCache $dataStructureCache,
         DataClassFactory $dataClassFactory,
     ): void {
-        if(config('data.structure_caching.enabled') === false) {
+        if (config('data.structure_caching.enabled') === false) {
             $this->error('Data structure caching is not enabled');
 
             return;
diff --git a/src/DataPipes/CastPropertiesDataPipe.php b/src/DataPipes/CastPropertiesDataPipe.php
@@ -175,7 +175,7 @@ protected function castIterableItems(
         array $properties,
         CreationContext $creationContext
     ): array {
-        if(empty($values)) {
+        if (empty($values)) {
             return $values;
         }
 
diff --git a/src/DataPipes/DefaultValuesDataPipe.php b/src/DataPipes/DefaultValuesDataPipe.php
@@ -15,7 +15,7 @@ public function handle(
         CreationContext $creationContext
     ): array {
         foreach ($class->properties as $name => $property) {
-            if(array_key_exists($name, $properties)) {
+            if (array_key_exists($name, $properties)) {
                 continue;
             }
 
diff --git a/src/LaravelDataServiceProvider.php b/src/LaravelDataServiceProvider.php
@@ -57,7 +57,7 @@ function () {
             );
         });
 
-        if(config('data.livewire.enable_synths') && class_exists(Livewire::class)) {
+        if (config('data.livewire.enable_synths') && class_exists(Livewire::class)) {
             $this->registerLivewireSynths();
         }
     }
diff --git a/src/Resolvers/DataCollectableFromSomethingResolver.php b/src/Resolvers/DataCollectableFromSomethingResolver.php
@@ -151,7 +151,7 @@ protected function normalizeItems(
             return $payload;
         }
 
-        if($items === null) {
+        if ($items === null) {
             return [];
         }
 
diff --git a/src/Resolvers/DataFromArrayResolver.php b/src/Resolvers/DataFromArrayResolver.php
@@ -31,7 +31,7 @@ public function execute(string $class, array $properties): BaseData
         $data = $this->createData($dataClass, $properties);
 
         foreach ($dataClass->properties as $property) {
-            if(
+            if (
                 $property->isPromoted
                 || $property->isReadonly
                 || ! array_key_exists($property->name, $properties)
diff --git a/src/Resolvers/NameMappersResolver.php b/src/Resolvers/NameMappersResolver.php
@@ -76,7 +76,7 @@ protected function resolveMapperClass(int|string|NameMapper $value): NameMapper
             return new ProvidedNameMapper($value);
         }
 
-        if($value instanceof NameMapper) {
+        if ($value instanceof NameMapper) {
             return $value;
         }
 
diff --git a/src/Resolvers/VisibleDataFieldsResolver.php b/src/Resolvers/VisibleDataFieldsResolver.php
@@ -307,7 +307,7 @@ protected function handleNonExistingNestedField(
             throw $exception;
         }
 
-        if(config('data.ignore_invalid_partials')) {
+        if (config('data.ignore_invalid_partials')) {
             return;
         }
 
diff --git a/src/RuleInferrers/AttributesRuleInferrer.php b/src/RuleInferrers/AttributesRuleInferrer.php
@@ -25,7 +25,7 @@ public function handle(
             ->attributes
             ->filter(fn (object $attribute) => $attribute instanceof ValidationRule)
             ->each(function (ValidationRule $rule) use ($rules) {
-                if($rule instanceof Present && $rules->hasType(RequiringRule::class)) {
+                if ($rule instanceof Present && $rules->hasType(RequiringRule::class)) {
                     $rules->removeType(RequiringRule::class);
                 }
 
diff --git a/src/Support/Annotations/CollectionAnnotationReader.php b/src/Support/Annotations/CollectionAnnotationReader.php
@@ -36,7 +36,7 @@ public function getForClass(string $className): ?CollectionAnnotation
 
         $class = new ReflectionClass($className);
 
-        if(empty($class->getDocComment())) {
+        if (empty($class->getDocComment())) {
             return self::$cache[$className] = null;
         }
 
diff --git a/src/Support/Creation/GlobalCastsCollection.php b/src/Support/Creation/GlobalCastsCollection.php
@@ -27,11 +27,11 @@ public function add(string $castable, Cast|IterableItemCast $cast): self
     {
         $castable = ltrim($castable, ' \\');
 
-        if($cast instanceof Cast) {
+        if ($cast instanceof Cast) {
             $this->casts[$castable] = $cast;
         }
 
-        if($cast instanceof IterableItemCast) {
+        if ($cast instanceof IterableItemCast) {
             $this->iterableItemCasts[$castable] = $cast;
         }
 
diff --git a/src/Support/DataType.php b/src/Support/DataType.php
@@ -31,7 +31,7 @@ public function acceptsType(string $type): bool
 
     public function getAcceptedTypes(): array
     {
-        if($this->isMixed) {
+        if ($this->isMixed) {
             return [];
         }
 
diff --git a/src/Support/Transformation/DataContext.php b/src/Support/Transformation/DataContext.php
@@ -58,7 +58,7 @@ public function mergeTransformationContext(
             foreach ($context->includePartials as $partial) {
                 $partial = $decoupledPartialResolver->execute($partial);
 
-                if($partial !== null) {
+                if ($partial !== null) {
                     $this->includePartials->attach($partial);
                 }
             }
@@ -70,7 +70,7 @@ public function mergeTransformationContext(
             foreach ($context->excludePartials as $partial) {
                 $partial = $decoupledPartialResolver->execute($partial);
 
-                if($partial !== null) {
+                if ($partial !== null) {
                     $this->excludePartials->attach($partial);
                 }
             }
@@ -82,7 +82,7 @@ public function mergeTransformationContext(
             foreach ($context->onlyPartials as $partial) {
                 $partial = $decoupledPartialResolver->execute($partial);
 
-                if($partial !== null) {
+                if ($partial !== null) {
                     $this->onlyPartials->attach($partial);
                 }
             }
@@ -94,7 +94,7 @@ public function mergeTransformationContext(
             foreach ($context->exceptPartials as $partial) {
                 $partial = $decoupledPartialResolver->execute($partial);
 
-                if($partial !== null) {
+                if ($partial !== null) {
                     $this->exceptPartials->attach($partial);
                 }
             }
diff --git a/src/Support/Validation/RuleDenormalizer.php b/src/Support/Validation/RuleDenormalizer.php
@@ -39,7 +39,7 @@ public function execute(mixed $rule, ValidationPath $path): array
             return [$rule->getRule($path)];
         }
 
-        if($rule instanceof CustomValidationAttribute) {
+        if ($rule instanceof CustomValidationAttribute) {
             return Arr::wrap($rule->getRules($path));
         }
 
diff --git a/tests/Fakes/ComplicatedData.php b/tests/Fakes/ComplicatedData.php
@@ -24,7 +24,7 @@ public function __construct(
         public int|Optional $undefinable,
         public mixed $mixed,
         #[WithCast(DateTimeInterfaceCast::class, format: 'd-m-Y', type: CarbonImmutable::class)]
-        public  $explicitCast,
+        public $explicitCast,
         public DateTime $defaultCast,
         public ?SimpleData $nestedData,
         /** @var \Spatie\LaravelData\Tests\Fakes\SimpleData[] */
diff --git a/tests/Fakes/Transformers/ConfidentialDataTransformer.php b/tests/Fakes/Transformers/ConfidentialDataTransformer.php
@@ -5,7 +5,6 @@
 use function collect;
 
 use Spatie\LaravelData\Support\DataProperty;
-
 use Spatie\LaravelData\Support\Transformation\TransformationContext;
 use Spatie\LaravelData\Transformers\Transformer;
 
diff --git a/tests/FillRouteParametersTest.php b/tests/FillRouteParametersTest.php
@@ -6,7 +6,6 @@
 use function Pest\Laravel\mock;
 
 use Spatie\LaravelData\Attributes\FromRouteParameter;
-
 use Spatie\LaravelData\Attributes\FromRouteParameterProperty;
 use Spatie\LaravelData\Attributes\MapInputName;
 use Spatie\LaravelData\Data;
diff --git a/tests/LivewireTest.php b/tests/LivewireTest.php
@@ -7,7 +7,6 @@
 
 use Spatie\LaravelData\Concerns\WireableData;
 use Spatie\LaravelData\Data;
-
 use Spatie\LaravelData\Lazy;
 use Spatie\LaravelData\Support\Livewire\LivewireDataCollectionSynth;
 use Spatie\LaravelData\Support\Livewire\LivewireDataSynth;
diff --git a/tests/Support/EloquentCasts/DataCollectionEloquentCastTest.php b/tests/Support/EloquentCasts/DataCollectionEloquentCastTest.php
@@ -7,11 +7,8 @@
 use Spatie\LaravelData\DataCollection;
 use Spatie\LaravelData\Tests\Fakes\AbstractData\AbstractData;
 use Spatie\LaravelData\Tests\Fakes\AbstractData\AbstractDataA;
-
 use Spatie\LaravelData\Tests\Fakes\AbstractData\AbstractDataB;
-
 use Spatie\LaravelData\Tests\Fakes\Models\DummyModelWithCasts;
-
 use Spatie\LaravelData\Tests\Fakes\Models\DummyModelWithCustomCollectionCasts;
 use Spatie\LaravelData\Tests\Fakes\Models\DummyModelWithDefaultCasts;
 use Spatie\LaravelData\Tests\Fakes\SimpleData;
diff --git a/tests/TestSupport/DataValidationAsserter.php b/tests/TestSupport/DataValidationAsserter.php
@@ -8,18 +8,14 @@
 use function PHPUnit\Framework\assertTrue;
 
 use Spatie\LaravelData\Data;
-
 use Spatie\LaravelData\DataPipeline;
-
 use Spatie\LaravelData\DataPipes\MapPropertiesDataPipe;
-
 use Spatie\LaravelData\DataPipes\ValidatePropertiesDataPipe;
 use Spatie\LaravelData\Normalizers\ArrayNormalizer;
 use Spatie\LaravelData\Resolvers\DataValidationRulesResolver;
 use Spatie\LaravelData\Resolvers\DataValidatorResolver;
 use Spatie\LaravelData\Support\Creation\CreationContextFactory;
 use Spatie\LaravelData\Support\Validation\DataRules;
-
 use Spatie\LaravelData\Support\Validation\ValidationPath;
 
 /**
diff --git a/tests/ValidationTest.php b/tests/ValidationTest.php
@@ -18,9 +18,7 @@
 use function PHPUnit\Framework\assertFalse;
 
 use Spatie\LaravelData\Attributes\DataCollectionOf;
-
 use Spatie\LaravelData\Attributes\MapInputName;
-
 use Spatie\LaravelData\Attributes\MapName;
 use Spatie\LaravelData\Attributes\Validation\ArrayType;
 use Spatie\LaravelData\Attributes\Validation\Bail;

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class UpdateSongController`
`63`	`63`	`}`
`64`	`64`	```
`65`	`65`
`66`		`-We have a complete section within these docs dedicated to validation, you can find it [here](/docs/laravel-data/v4/validation).`
	`66`	`+We have a complete section within these docs dedicated to validation, you can find it [here](/docs/laravel-data/v4/validation/introduction).`
`67`	`67`
`68`	`68`	`## Getting the data object filled with request data from anywhere`
`69`	`69`
Original file line number	Diff line number	Diff line change
@@ -29,7 +29,7 @@ So it is not required to add the `required` and `string` rule, these will be add
`29`	`29`	`]`
`30`	`30`	```
`31`	`31`
`32`		`-For each Laravel validation rule we've got a matching validation attribute, you can find a list of them [here](/docs/laravel-data/v4/advanced-usage/using-attributes).`
	`32`	`+For each Laravel validation rule we've got a matching validation attribute, you can find a list of them [here](/docs/laravel-data/v4/advanced-usage/validation-attributes).`
`33`	`33`
`34`	`34`	`## Referencing route parameters`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function __construct(`
`38`	`38`
`39`	`39`	`public function getRule(ValidationPath $path): object\|string`
`40`	`40`	`{`
`41`		`- if($this->rule) {`
	`41`	`+ if ($this->rule) {`
`42`	`42`	`return $this->rule;`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function __construct(`
`28`	`28`
`29`	`29`	`public function getRule(ValidationPath $path): object\|string`
`30`	`30`	`{`
`31`		`- if($this->rule) {`
	`31`	`+ if ($this->rule) {`
`32`	`32`	`return $this->rule;`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(array\|string\|BaseNotIn\|RouteParameterReference ...$v`
`22`	`22`
`23`	`23`	`public function getRule(ValidationPath $path): object\|string`
`24`	`24`	`{`
`25`		`- if($this->rule) {`
	`25`	`+ if ($this->rule) {`
`26`	`26`	`return $this->rule;`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function __construct(`
`30`	`30`
`31`	`31`	`public function getRule(ValidationPath $path): object\|string`
`32`	`32`	`{`
`33`		`- if($this->rule) {`
	`33`	`+ if ($this->rule) {`
`34`	`34`	`return $this->rule;`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@ class EnumerableCast implements Cast`
`11`	`11`	`{`
`12`	`12`	`public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): mixed`
`13`	`13`	`{`
`14`		`- if(config('data.features.cast_and_transform_iterables')) {`
	`14`	`+ if (config('data.features.cast_and_transform_iterables')) {`
`15`	`15`	`return Uncastable::create();`
`16`	`16`	`}`
`17`	`17`
`18`		`- if($property->type->kind->isDataCollectable()) {`
	`18`	`+ if ($property->type->kind->isDataCollectable()) {`
`19`	`19`	`return Uncastable::create();`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function cast(DataProperty $property, mixed $value, array $properties, Cr`
`22`	`22`	`try {`
`23`	`23`	`return unserialize($value);`
`24`	`24`	`} catch (\Throwable $e) {`
`25`		`- if($this->failSilently) {`
	`25`	`+ if ($this->failSilently) {`
`26`	`26`	`return Uncastable::create();`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ protected function castIterableItems(`
`175`	`175`	`array $properties,`
`176`	`176`	`CreationContext $creationContext`
`177`	`177`	`): array {`
`178`		`- if(empty($values)) {`
	`178`	`+ if (empty($values)) {`
`179`	`179`	`return $values;`
`180`	`180`	`}`
`181`	`181`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function handle(`
`15`	`15`	`CreationContext $creationContext`
`16`	`16`	`): array {`
`17`	`17`	`foreach ($class->properties as $name => $property) {`
`18`		`- if(array_key_exists($name, $properties)) {`
	`18`	`+ if (array_key_exists($name, $properties)) {`
`19`	`19`	`continue;`
`20`	`20`	`}`
`21`	`21`