Skip to content

Commit

Permalink
Fix styling
Browse files Browse the repository at this point in the history
  • Loading branch information
rubenvanassche authored and github-actions[bot] committed Mar 17, 2023
1 parent e68b7d6 commit 9465cb8
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 21 deletions.
5 changes: 2 additions & 3 deletions src/DataPipeline.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
);

Expand Down
3 changes: 1 addition & 2 deletions src/Resolvers/DataFromSomethingResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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)
);

Expand Down
2 changes: 1 addition & 1 deletion src/Resolvers/EmptyDataResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
14 changes: 6 additions & 8 deletions src/Support/DataConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -19,7 +17,7 @@ class DataConfig
/** @var array<string, \Spatie\LaravelData\Casts\Cast> */
protected array $casts = [];

/** @var array<string, \Spatie\LaravelData\Support\ResolvedDataPipeline> */
/** @var array<string, \Spatie\LaravelData\Support\ResolvedDataPipeline> */
protected array $resolvedDataPipelines = [];

/** @var \Spatie\LaravelData\RuleInferrers\RuleInferrer[] */
Expand Down Expand Up @@ -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];
}

Expand Down Expand Up @@ -98,9 +96,9 @@ public function getRuleInferrers(): array

public function reset(): self
{
$this->dataClasses = [];
$this->resolvedDataPipelines = [];
$this->dataClasses = [];
$this->resolvedDataPipelines = [];

return $this;
return $this;
}
}
3 changes: 1 addition & 2 deletions src/Transformers/DataCollectableTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Transformers/DataTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 5 additions & 4 deletions tests/ValidationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 9465cb8

Please sign in to comment.