diff --git a/src/DataPipeline.php b/src/DataPipeline.php index e8e3e416..114ad439 100644 --- a/src/DataPipeline.php +++ b/src/DataPipeline.php @@ -4,7 +4,6 @@ use Illuminate\Support\Collection; use Spatie\LaravelData\DataPipes\DataPipe; -use Spatie\LaravelData\Exceptions\CannotCreateData; use Spatie\LaravelData\Normalizers\Normalizer; use Spatie\LaravelData\Support\DataConfig; use Spatie\LaravelData\Support\ResolvedDataPipeline; @@ -65,13 +64,13 @@ public function resolve(): ResolvedDataPipeline /** @var \Spatie\LaravelData\Normalizers\Normalizer[] $normalizers */ $normalizers = array_map( - fn(string|Normalizer $normalizer) => is_string($normalizer) ? app($normalizer) : $normalizer, + fn (string|Normalizer $normalizer) => is_string($normalizer) ? app($normalizer) : $normalizer, $normalizers ); /** @var \Spatie\LaravelData\DataPipes\DataPipe[] $pipes */ $pipes = array_map( - fn(string|DataPipe $pipe) => is_string($pipe) ? app($pipe) : $pipe, + fn (string|DataPipe $pipe) => is_string($pipe) ? app($pipe) : $pipe, $this->pipes ); diff --git a/src/Resolvers/DataFromSomethingResolver.php b/src/Resolvers/DataFromSomethingResolver.php index ef5a8862..7eba218e 100644 --- a/src/Resolvers/DataFromSomethingResolver.php +++ b/src/Resolvers/DataFromSomethingResolver.php @@ -5,7 +5,6 @@ use Illuminate\Http\Request; use Illuminate\Support\Collection; use Spatie\LaravelData\Contracts\BaseData; -use Spatie\LaravelData\Normalizers\ArrayableNormalizer; use Spatie\LaravelData\Support\DataConfig; use Spatie\LaravelData\Support\DataMethod; @@ -63,7 +62,7 @@ protected function createFromCustomCreationMethod(string $class, array $payloads ->getDataClass($class) ->methods ->filter( - fn(DataMethod $method) => $method->isCustomCreationMethod + fn (DataMethod $method) => $method->isCustomCreationMethod && ! in_array($method->name, $this->ignoredMagicalMethods) ); diff --git a/src/Resolvers/EmptyDataResolver.php b/src/Resolvers/EmptyDataResolver.php index 9bab4539..9c86e2e5 100644 --- a/src/Resolvers/EmptyDataResolver.php +++ b/src/Resolvers/EmptyDataResolver.php @@ -19,7 +19,7 @@ public function execute(string $class, array $extra = []): array $payload = []; - foreach ($dataClass->properties as $property){ + foreach ($dataClass->properties as $property) { $name = $property->outputMappedName ?? $property->name; if ($property->hasDefaultValue) { diff --git a/src/Support/DataConfig.php b/src/Support/DataConfig.php index 150317b5..c9591b5e 100644 --- a/src/Support/DataConfig.php +++ b/src/Support/DataConfig.php @@ -4,8 +4,6 @@ use ReflectionClass; use Spatie\LaravelData\Casts\Cast; -use Spatie\LaravelData\Contracts\BaseData; -use Spatie\LaravelData\DataPipeline; use Spatie\LaravelData\Transformers\Transformer; class DataConfig @@ -19,7 +17,7 @@ class DataConfig /** @var array */ protected array $casts = []; - /** @var array */ + /** @var array */ protected array $resolvedDataPipelines = []; /** @var \Spatie\LaravelData\RuleInferrers\RuleInferrer[] */ @@ -50,9 +48,9 @@ public function getDataClass(string $class): DataClass return $this->dataClasses[$class] = DataClass::create(new ReflectionClass($class)); } - public function getResolvedDataPipeline(string $class): ResolvedDataPipeline + public function getResolvedDataPipeline(string $class): ResolvedDataPipeline { - if(array_key_exists($class, $this->resolvedDataPipelines)){ + if (array_key_exists($class, $this->resolvedDataPipelines)) { return $this->resolvedDataPipelines[$class]; } @@ -98,9 +96,9 @@ public function getRuleInferrers(): array public function reset(): self { - $this->dataClasses = []; - $this->resolvedDataPipelines = []; + $this->dataClasses = []; + $this->resolvedDataPipelines = []; - return $this; + return $this; } } diff --git a/src/Transformers/DataCollectableTransformer.php b/src/Transformers/DataCollectableTransformer.php index 3a19679f..5c3bdbb4 100644 --- a/src/Transformers/DataCollectableTransformer.php +++ b/src/Transformers/DataCollectableTransformer.php @@ -9,7 +9,6 @@ use Illuminate\Support\Enumerable; use Spatie\LaravelData\Contracts\BaseData; use Spatie\LaravelData\Contracts\IncludeableData; -use Spatie\LaravelData\Contracts\TransformableData; use Spatie\LaravelData\Support\PartialTrees; use Spatie\LaravelData\Support\Wrapping\Wrap; use Spatie\LaravelData\Support\Wrapping\WrapExecutionType; @@ -71,7 +70,7 @@ protected function transformCollection(Enumerable $items): array protected function transformItemClosure(): Closure { - return fn(BaseData $item) => $item instanceof IncludeableData + return fn (BaseData $item) => $item instanceof IncludeableData ? $item->withPartialTrees($this->trees) : $item; } diff --git a/src/Transformers/DataTransformer.php b/src/Transformers/DataTransformer.php index 63f1cf35..736f2b09 100644 --- a/src/Transformers/DataTransformer.php +++ b/src/Transformers/DataTransformer.php @@ -230,7 +230,7 @@ protected function resolvePropertyValue( }; if ($value instanceof TransformableData && $this->transformValues) { - return $value->transform($this->transformValues, $wrapExecutionType, $this->mapPropertyNames,); + return $value->transform($this->transformValues, $wrapExecutionType, $this->mapPropertyNames, ); } return $value; diff --git a/tests/ValidationTest.php b/tests/ValidationTest.php index 212ff027..93fd8f74 100644 --- a/tests/ValidationTest.php +++ b/tests/ValidationTest.php @@ -13,21 +13,21 @@ use Illuminate\Validation\ValidationException; use Illuminate\Validation\Validator; -use Spatie\LaravelData\Support\DataConfig; use function Pest\Laravel\mock; use function PHPUnit\Framework\assertFalse; use Spatie\LaravelData\Attributes\DataCollectionOf; use Spatie\LaravelData\Attributes\MapInputName; -use Spatie\LaravelData\Attributes\MapName; +use Spatie\LaravelData\Attributes\MapName; use Spatie\LaravelData\Attributes\Validation\ArrayType; use Spatie\LaravelData\Attributes\Validation\Bail; -use Spatie\LaravelData\Attributes\Validation\Exists; +use Spatie\LaravelData\Attributes\Validation\Exists; use Spatie\LaravelData\Attributes\Validation\In; + use Spatie\LaravelData\Attributes\Validation\IntegerType; use Spatie\LaravelData\Attributes\Validation\Max; use Spatie\LaravelData\Attributes\Validation\Min; @@ -40,8 +40,8 @@ use Spatie\LaravelData\Attributes\WithoutValidation; use Spatie\LaravelData\Data; use Spatie\LaravelData\DataCollection; - use Spatie\LaravelData\DataPipeline; + use Spatie\LaravelData\DataPipes\AuthorizedDataPipe; use Spatie\LaravelData\DataPipes\CastPropertiesDataPipe; use Spatie\LaravelData\DataPipes\DefaultValuesDataPipe; @@ -53,6 +53,7 @@ use Spatie\LaravelData\Normalizers\ModelNormalizer; use Spatie\LaravelData\Normalizers\ObjectNormalizer; use Spatie\LaravelData\Optional; +use Spatie\LaravelData\Support\DataConfig; use Spatie\LaravelData\Support\Validation\References\FieldReference; use Spatie\LaravelData\Support\Validation\References\RouteParameterReference; use Spatie\LaravelData\Support\Validation\ValidationContext;