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 Aug 10, 2022
1 parent db1e657 commit ad2abb2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
19 changes: 7 additions & 12 deletions src/Resolvers/DataPropertyValidationRulesResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@
use Spatie\LaravelData\Attributes\Validation\Present;
use Spatie\LaravelData\Attributes\Validation\Required;
use Spatie\LaravelData\Attributes\Validation\Sometimes;
use Spatie\LaravelData\RuleInferrers\AttributesRuleInferrer;
use Spatie\LaravelData\RuleInferrers\BuiltInTypesRuleInferrer;
use Spatie\LaravelData\RuleInferrers\NullableRuleInferrer;
use Spatie\LaravelData\RuleInferrers\RequiredRuleInferrer;
use Spatie\LaravelData\RuleInferrers\RuleInferrer;
use Spatie\LaravelData\Support\DataConfig;
use Spatie\LaravelData\Support\DataProperty;
use Spatie\LaravelData\Support\Validation\RulesCollection;
Expand Down Expand Up @@ -54,25 +49,25 @@ protected function getNestedRules(

$toplevelRules = RulesCollection::create();

if($isNullable){
if ($isNullable) {
$toplevelRules->add(new Nullable());
}

if($isOptional){
$toplevelRules->add(New Sometimes());
if ($isOptional) {
$toplevelRules->add(new Sometimes());
}

if(! $isNullable && ! $isOptional && $property->type->isDataObject){
if (! $isNullable && ! $isOptional && $property->type->isDataObject) {
$toplevelRules->add(new Required());
}

if(! $isNullable && ! $isOptional&& $property->type->isDataCollectable){
if (! $isNullable && ! $isOptional && $property->type->isDataCollectable) {
$toplevelRules->add(new Present());
}

$toplevelRules->add(ArrayType::create());

foreach ($this->dataConfig->getRuleInferrers() as $inferrer){
foreach ($this->dataConfig->getRuleInferrers() as $inferrer) {
$inferrer->handle($property, $toplevelRules);
}

Expand All @@ -82,7 +77,7 @@ protected function getNestedRules(
$payload,
$this->isNestedDataNullable($nullable, $property)
)
->mapWithKeys(fn(array $rules, string $name) => [
->mapWithKeys(fn (array $rules, string $name) => [
"{$prefix}{$name}" => $rules,
])
->prepend($toplevelRules->normalize(), $propertyName);
Expand Down
3 changes: 0 additions & 3 deletions tests/Resolvers/DataClassValidationRulesResolverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
use Illuminate\Validation\Rules\Exists as LaravelExists;
use Spatie\LaravelData\Attributes\DataCollectionOf;
use Spatie\LaravelData\Attributes\Validation\Exists;
use Spatie\LaravelData\Attributes\Validation\Nullable;
use Spatie\LaravelData\Attributes\Validation\Numeric;
use Spatie\LaravelData\Attributes\Validation\StringType;
use Spatie\LaravelData\Attributes\WithoutValidation;
use Spatie\LaravelData\Data;
use Spatie\LaravelData\DataCollection;
Expand Down

0 comments on commit ad2abb2

Please sign in to comment.