Skip to content

Commit 2b58756

Browse files
committed
fix: resolve pint 1.28 formatting issues
1 parent 0137143 commit 2b58756

3 files changed

Lines changed: 42 additions & 21 deletions

File tree

config/data.php

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,31 @@
11
<?php
22

3+
use Illuminate\Contracts\Support\Arrayable;
4+
use Spatie\LaravelData\Casts\DateTimeInterfaceCast;
5+
use Spatie\LaravelData\Casts\EnumCast;
6+
use Spatie\LaravelData\Normalizers\ArrayableNormalizer;
7+
use Spatie\LaravelData\Normalizers\ArrayNormalizer;
8+
use Spatie\LaravelData\Normalizers\FormRequestNormalizer;
9+
use Spatie\LaravelData\Normalizers\JsonNormalizer;
10+
use Spatie\LaravelData\Normalizers\ModelNormalizer;
11+
use Spatie\LaravelData\Normalizers\ObjectNormalizer;
12+
use Spatie\LaravelData\RuleInferrers\AttributesRuleInferrer;
13+
use Spatie\LaravelData\RuleInferrers\BuiltInTypesRuleInferrer;
14+
use Spatie\LaravelData\RuleInferrers\NullableRuleInferrer;
15+
use Spatie\LaravelData\RuleInferrers\RequiredRuleInferrer;
16+
use Spatie\LaravelData\RuleInferrers\SometimesRuleInferrer;
17+
use Spatie\LaravelData\Support\Creation\ValidationStrategy;
18+
use Spatie\LaravelData\Transformers\ArrayableTransformer;
19+
use Spatie\LaravelData\Transformers\DateTimeInterfaceTransformer;
20+
use Spatie\LaravelData\Transformers\EnumTransformer;
21+
322
return [
423
/*
524
|--------------------------------------------------------------------------
625
| Validation Strategy
726
|--------------------------------------------------------------------------
827
*/
9-
'validation_strategy' => \Spatie\LaravelData\Support\Creation\ValidationStrategy::Always,
28+
'validation_strategy' => ValidationStrategy::Always,
1029

1130
/*
1231
|--------------------------------------------------------------------------
@@ -31,12 +50,12 @@
3150
|--------------------------------------------------------------------------
3251
*/
3352
'normalizers' => [
34-
\Spatie\LaravelData\Normalizers\ModelNormalizer::class,
35-
\Spatie\LaravelData\Normalizers\FormRequestNormalizer::class,
36-
\Spatie\LaravelData\Normalizers\ArrayableNormalizer::class,
37-
\Spatie\LaravelData\Normalizers\ObjectNormalizer::class,
38-
\Spatie\LaravelData\Normalizers\ArrayNormalizer::class,
39-
\Spatie\LaravelData\Normalizers\JsonNormalizer::class,
53+
ModelNormalizer::class,
54+
FormRequestNormalizer::class,
55+
ArrayableNormalizer::class,
56+
ObjectNormalizer::class,
57+
ArrayNormalizer::class,
58+
JsonNormalizer::class,
4059
],
4160

4261
/*
@@ -45,9 +64,9 @@
4564
|--------------------------------------------------------------------------
4665
*/
4766
'transformers' => [
48-
DateTimeInterface::class => \Spatie\LaravelData\Transformers\DateTimeInterfaceTransformer::class,
49-
\Illuminate\Contracts\Support\Arrayable::class => \Spatie\LaravelData\Transformers\ArrayableTransformer::class,
50-
BackedEnum::class => \Spatie\LaravelData\Transformers\EnumTransformer::class,
67+
DateTimeInterface::class => DateTimeInterfaceTransformer::class,
68+
Arrayable::class => ArrayableTransformer::class,
69+
BackedEnum::class => EnumTransformer::class,
5170
],
5271

5372
/*
@@ -56,8 +75,8 @@
5675
|--------------------------------------------------------------------------
5776
*/
5877
'casts' => [
59-
DateTimeInterface::class => \Spatie\LaravelData\Casts\DateTimeInterfaceCast::class,
60-
BackedEnum::class => \Spatie\LaravelData\Casts\EnumCast::class,
78+
DateTimeInterface::class => DateTimeInterfaceCast::class,
79+
BackedEnum::class => EnumCast::class,
6180
],
6281

6382
/*
@@ -66,10 +85,10 @@
6685
|--------------------------------------------------------------------------
6786
*/
6887
'rule_inferrers' => [
69-
\Spatie\LaravelData\RuleInferrers\SometimesRuleInferrer::class,
70-
\Spatie\LaravelData\RuleInferrers\NullableRuleInferrer::class,
71-
\Spatie\LaravelData\RuleInferrers\RequiredRuleInferrer::class,
72-
\Spatie\LaravelData\RuleInferrers\BuiltInTypesRuleInferrer::class,
73-
\Spatie\LaravelData\RuleInferrers\AttributesRuleInferrer::class,
88+
SometimesRuleInferrer::class,
89+
NullableRuleInferrer::class,
90+
RequiredRuleInferrer::class,
91+
BuiltInTypesRuleInferrer::class,
92+
AttributesRuleInferrer::class,
7493
],
7594
];

src/FieldTypeSystem/FieldSchema.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
use Relaticle\CustomFields\Data\FieldTypeData;
1010
use Relaticle\CustomFields\Enums\FieldDataType;
1111
use Relaticle\CustomFields\Enums\ValidationRule;
12+
use Relaticle\CustomFields\Enums\VisibilityOperator;
1213
use Spatie\LaravelData\Data;
1314

1415
/**
@@ -55,7 +56,7 @@ class FieldSchema
5556

5657
protected bool $withoutUserOptions = false;
5758

58-
/** @var array<int, \Relaticle\CustomFields\Enums\VisibilityOperator>|null */
59+
/** @var array<int, VisibilityOperator>|null */
5960
private ?array $visibilityOperators = null;
6061

6162
private ?string $settingsDataClass = null;
@@ -368,7 +369,7 @@ public function withoutUserOptions(): self
368369
/**
369370
* Override the default visibility operators derived from the data type.
370371
*
371-
* @param array<int, \Relaticle\CustomFields\Enums\VisibilityOperator> $operators
372+
* @param array<int, VisibilityOperator> $operators
372373
*/
373374
public function visibilityOperators(array $operators): self
374375
{

tests/Feature/Admin/Pages/CustomFieldsFieldManagementTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
declare(strict_types=1);
44

55
use Relaticle\CustomFields\CustomFields;
6+
use Relaticle\CustomFields\Data\CustomFieldOptionSettingsData;
67
use Relaticle\CustomFields\Livewire\ManageCustomField;
78
use Relaticle\CustomFields\Livewire\ManageCustomFieldSection;
89
use Relaticle\CustomFields\Models\CustomField;
@@ -399,8 +400,8 @@
399400
'code' => 'color_picker',
400401
]);
401402

402-
$field->options->first()->update(['settings' => new \Relaticle\CustomFields\Data\CustomFieldOptionSettingsData(color: '#ff0000')]);
403-
$field->options->last()->update(['settings' => new \Relaticle\CustomFields\Data\CustomFieldOptionSettingsData(color: '#0000ff')]);
403+
$field->options->first()->update(['settings' => new CustomFieldOptionSettingsData(color: '#ff0000')]);
404+
$field->options->last()->update(['settings' => new CustomFieldOptionSettingsData(color: '#0000ff')]);
404405

405406
livewire(ManageCustomField::class, [
406407
'field' => $field->fresh(),

0 commit comments

Comments
 (0)