Merge pull request #523 from BadJacky/bugfix/update-attribute-target-…

…property-parameter enhance: Add TARGET_PARAMETER to Attribute for improved Validation
spatie · Aug 4, 2023 · 41b9d45 · 41b9d45
2 parents 731a0b1 + e4990c3
commit 41b9d45
Show file tree

Hide file tree

Showing 80 changed files with 138 additions and 125 deletions.
diff --git a/src/Attributes/Validation/Accepted.php b/src/Attributes/Validation/Accepted.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Accepted extends StringValidationAttribute
 {
     public static function keyword(): string

diff --git a/src/Attributes/Validation/AcceptedIf.php b/src/Attributes/Validation/AcceptedIf.php
@@ -7,7 +7,7 @@
 use Spatie\LaravelData\Support\Validation\References\FieldReference;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class AcceptedIf extends StringValidationAttribute
 {
     protected FieldReference $field;

diff --git a/src/Attributes/Validation/ActiveUrl.php b/src/Attributes/Validation/ActiveUrl.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class ActiveUrl extends StringValidationAttribute
 {
     public static function keyword(): string

diff --git a/src/Attributes/Validation/After.php b/src/Attributes/Validation/After.php
@@ -6,7 +6,7 @@
 use DateTimeInterface;
 use Spatie\LaravelData\Support\Validation\References\FieldReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class After extends StringValidationAttribute
 {
     public function __construct(protected string|DateTimeInterface|FieldReference $date)

diff --git a/src/Attributes/Validation/AfterOrEqual.php b/src/Attributes/Validation/AfterOrEqual.php
@@ -6,7 +6,7 @@
 use DateTimeInterface;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class AfterOrEqual extends StringValidationAttribute
 {
     public function __construct(protected string|DateTimeInterface|RouteParameterReference $date)

diff --git a/src/Attributes/Validation/Alpha.php b/src/Attributes/Validation/Alpha.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Alpha extends StringValidationAttribute
 {
     public static function keyword(): string

diff --git a/src/Attributes/Validation/AlphaDash.php b/src/Attributes/Validation/AlphaDash.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class AlphaDash extends StringValidationAttribute
 {
     public static function keyword(): string

diff --git a/src/Attributes/Validation/AlphaNumeric.php b/src/Attributes/Validation/AlphaNumeric.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class AlphaNumeric extends StringValidationAttribute
 {
     public static function keyword(): string

diff --git a/src/Attributes/Validation/ArrayType.php b/src/Attributes/Validation/ArrayType.php
@@ -6,7 +6,7 @@
 use Illuminate\Support\Arr;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class ArrayType extends StringValidationAttribute
 {
     protected array $keys;

diff --git a/src/Attributes/Validation/Bail.php b/src/Attributes/Validation/Bail.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Bail extends StringValidationAttribute
 {
     public static function keyword(): string

diff --git a/src/Attributes/Validation/Before.php b/src/Attributes/Validation/Before.php
@@ -7,7 +7,7 @@
 use Spatie\LaravelData\Support\Validation\References\FieldReference;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Before extends StringValidationAttribute
 {
     public function __construct(protected string|DateTimeInterface|RouteParameterReference|FieldReference $date)

diff --git a/src/Attributes/Validation/BeforeOrEqual.php b/src/Attributes/Validation/BeforeOrEqual.php
@@ -6,7 +6,7 @@
 use DateTimeInterface;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class BeforeOrEqual extends StringValidationAttribute
 {
     public function __construct(protected string | DateTimeInterface|RouteParameterReference $date)

diff --git a/src/Attributes/Validation/Between.php b/src/Attributes/Validation/Between.php
@@ -5,7 +5,7 @@
 use Attribute;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Between extends StringValidationAttribute
 {
     public function __construct(protected int|float|RouteParameterReference $min, protected int|float|RouteParameterReference $max)

diff --git a/src/Attributes/Validation/BooleanType.php b/src/Attributes/Validation/BooleanType.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class BooleanType extends StringValidationAttribute
 {
     public static function keyword(): string

diff --git a/src/Attributes/Validation/Confirmed.php b/src/Attributes/Validation/Confirmed.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Confirmed extends StringValidationAttribute
 {
     public static function keyword(): string

diff --git a/src/Attributes/Validation/CurrentPassword.php b/src/Attributes/Validation/CurrentPassword.php
@@ -6,7 +6,7 @@
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 use Spatie\LaravelData\Tests\Fakes\Enums\DummyBackedEnum;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class CurrentPassword extends StringValidationAttribute
 {
     public function __construct(protected null|string|DummyBackedEnum|RouteParameterReference $guard = null)

diff --git a/src/Attributes/Validation/Date.php b/src/Attributes/Validation/Date.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Date extends StringValidationAttribute
 {
     public static function keyword(): string

diff --git a/src/Attributes/Validation/DateEquals.php b/src/Attributes/Validation/DateEquals.php
@@ -6,10 +6,10 @@
 use DateTimeInterface;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class DateEquals extends StringValidationAttribute
 {
-    public function __construct(protected string | DateTimeInterface|RouteParameterReference $date)
+    public function __construct(protected string|DateTimeInterface|RouteParameterReference $date)
     {
     }
 

diff --git a/src/Attributes/Validation/DateFormat.php b/src/Attributes/Validation/DateFormat.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class DateFormat extends StringValidationAttribute
 {
     public function __construct(protected string $format)

diff --git a/src/Attributes/Validation/Different.php b/src/Attributes/Validation/Different.php
@@ -5,7 +5,7 @@
 use Attribute;
 use Spatie\LaravelData\Support\Validation\References\FieldReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Different extends StringValidationAttribute
 {
     protected FieldReference $field;

diff --git a/src/Attributes/Validation/Digits.php b/src/Attributes/Validation/Digits.php
@@ -5,7 +5,7 @@
 use Attribute;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Digits extends StringValidationAttribute
 {
     public function __construct(protected int|RouteParameterReference $value)

diff --git a/src/Attributes/Validation/DigitsBetween.php b/src/Attributes/Validation/DigitsBetween.php
@@ -5,7 +5,7 @@
 use Attribute;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class DigitsBetween extends StringValidationAttribute
 {
     public function __construct(protected int|RouteParameterReference $min, protected int|RouteParameterReference $max)

diff --git a/src/Attributes/Validation/Dimensions.php b/src/Attributes/Validation/Dimensions.php
@@ -9,21 +9,22 @@
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 use Spatie\LaravelData\Support\Validation\ValidationPath;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Dimensions extends ObjectValidationAttribute
 {
     protected BaseDimensions $rule;
 
     public function __construct(
-        null|int|RouteParameterReference $minWidth = null,
-        null|int|RouteParameterReference $minHeight = null,
-        null|int|RouteParameterReference $maxWidth = null,
-        null|int|RouteParameterReference $maxHeight = null,
+        null|int|RouteParameterReference          $minWidth = null,
+        null|int|RouteParameterReference          $minHeight = null,
+        null|int|RouteParameterReference          $maxWidth = null,
+        null|int|RouteParameterReference          $maxHeight = null,
         null|float|string|RouteParameterReference $ratio = null,
-        null|int|RouteParameterReference $width = null,
-        null|int|RouteParameterReference $height = null,
-        null|BaseDimensions $rule = null,
-    ) {
+        null|int|RouteParameterReference          $width = null,
+        null|int|RouteParameterReference          $height = null,
+        null|BaseDimensions                       $rule = null,
+    )
+    {
         $minWidth = $this->normalizePossibleRouteReferenceParameter($minWidth);
         $minHeight = $this->normalizePossibleRouteReferenceParameter($minHeight);
         $maxWidth = $this->normalizePossibleRouteReferenceParameter($maxWidth);

diff --git a/src/Attributes/Validation/Distinct.php b/src/Attributes/Validation/Distinct.php
@@ -6,7 +6,7 @@
 use Spatie\LaravelData\Exceptions\CannotBuildValidationRule;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Distinct extends StringValidationAttribute
 {
     public const Strict = 'strict';

diff --git a/src/Attributes/Validation/Email.php b/src/Attributes/Validation/Email.php
@@ -8,7 +8,7 @@
 use Spatie\LaravelData\Exceptions\CannotBuildValidationRule;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Email extends StringValidationAttribute
 {
     public const RfcValidation = 'rfc';
@@ -32,15 +32,15 @@ public static function keyword(): string
     public function parameters(): array
     {
         return collect($this->modes)
-            ->whenEmpty(fn (Collection $modes) => $modes->add(self::RfcValidation))
-            ->filter(fn (string $mode) => in_array($mode, [
+            ->whenEmpty(fn(Collection $modes) => $modes->add(self::RfcValidation))
+            ->filter(fn(string $mode) => in_array($mode, [
                 self::RfcValidation,
                 self::NoRfcWarningsValidation,
                 self::DnsCheckValidation,
                 self::SpoofCheckValidation,
                 self::FilterEmailValidation,
             ]))
-            ->whenEmpty(fn () => throw CannotBuildValidationRule::create("Email validation rule needs at least one valid mode."))
+            ->whenEmpty(fn() => throw CannotBuildValidationRule::create("Email validation rule needs at least one valid mode."))
             ->all();
     }
 }
diff --git a/src/Attributes/Validation/EndsWith.php b/src/Attributes/Validation/EndsWith.php
@@ -6,7 +6,7 @@
 use Illuminate\Support\Arr;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class EndsWith extends StringValidationAttribute
 {
     protected string|array $values;

diff --git a/src/Attributes/Validation/Enum.php b/src/Attributes/Validation/Enum.php
@@ -7,7 +7,7 @@
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 use Spatie\LaravelData\Support\Validation\ValidationPath;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Enum extends ObjectValidationAttribute
 {
     protected EnumRule $rule;
@@ -16,7 +16,7 @@ public function __construct(string|EnumRule|RouteParameterReference $enum)
     {
         $this->rule = $enum instanceof EnumRule
             ? $enum
-            : new EnumRule((string) $enum);
+            : new EnumRule((string)$enum);
     }
 
     public static function keyword(): string

diff --git a/src/Attributes/Validation/Exclude.php b/src/Attributes/Validation/Exclude.php
@@ -6,7 +6,7 @@
 use Illuminate\Validation\Rules\ExcludeIf;
 use Spatie\LaravelData\Support\Validation\ValidationPath;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Exclude extends ObjectValidationAttribute
 {
     public function __construct(protected ExcludeIf $rule)

diff --git a/src/Attributes/Validation/ExcludeIf.php b/src/Attributes/Validation/ExcludeIf.php
@@ -7,15 +7,16 @@
 use Spatie\LaravelData\Support\Validation\References\FieldReference;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class ExcludeIf extends StringValidationAttribute
 {
     protected FieldReference $field;
 
     public function __construct(
-        string|FieldReference $field,
+        string|FieldReference                                              $field,
         protected string|int|float|bool|BackedEnum|RouteParameterReference $value
-    ) {
+    )
+    {
         $this->field = $this->parseFieldReference($field);
     }
 

diff --git a/src/Attributes/Validation/ExcludeUnless.php b/src/Attributes/Validation/ExcludeUnless.php
@@ -7,15 +7,16 @@
 use Spatie\LaravelData\Support\Validation\References\FieldReference;
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class ExcludeUnless extends StringValidationAttribute
 {
     protected FieldReference $field;
 
     public function __construct(
-        string|FieldReference $field,
+        string|FieldReference                                              $field,
         protected string|int|float|bool|BackedEnum|RouteParameterReference $value
-    ) {
+    )
+    {
         $this->field = $this->parseFieldReference($field);
     }
 

diff --git a/src/Attributes/Validation/ExcludeWithout.php b/src/Attributes/Validation/ExcludeWithout.php
@@ -5,14 +5,15 @@
 use Attribute;
 use Spatie\LaravelData\Support\Validation\References\FieldReference;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class ExcludeWithout extends StringValidationAttribute
 {
     protected FieldReference $field;
 
     public function __construct(
         string|FieldReference $field,
-    ) {
+    )
+    {
         $this->field = $this->parseFieldReference($field);
     }
 

diff --git a/src/Attributes/Validation/Exists.php b/src/Attributes/Validation/Exists.php
@@ -9,7 +9,7 @@
 use Spatie\LaravelData\Support\Validation\References\RouteParameterReference;
 use Spatie\LaravelData\Support\Validation\ValidationPath;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Exists extends ObjectValidationAttribute
 {
     protected BaseExists $rule;

diff --git a/src/Attributes/Validation/File.php b/src/Attributes/Validation/File.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class File extends StringValidationAttribute
 {
     public static function keyword(): string

diff --git a/src/Attributes/Validation/Filled.php b/src/Attributes/Validation/Filled.php
@@ -4,7 +4,7 @@
 
 use Attribute;
 
-#[Attribute(Attribute::TARGET_PROPERTY)]
+#[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER)]
 class Filled extends StringValidationAttribute
 {
     public static function keyword(): string