Ignore property validation when property value is null (#17)

Co-authored-by: Bartosz Ozga <[email protected]>
dualmediaspzoo · Jan 10, 2025 · 4a2bc40 · 4a2bc40
1 parent b64d0aa
commit 4a2bc40
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 42 deletions.
diff --git a/src/Interfaces/Type/CoercerInterface.php b/src/Interfaces/Type/CoercerInterface.php
@@ -29,7 +29,6 @@ public function supports(
     public function coerce(
         string $propertyPath,
         Property $property,
-        mixed $value,
-        bool $validatePropertyConstraints = false
+        mixed $value
     ): CoerceResult;
 }
diff --git a/src/Interfaces/Type/CoercionServiceInterface.php b/src/Interfaces/Type/CoercionServiceInterface.php
@@ -29,7 +29,6 @@ public function supports(
     public function coerce(
         string $propertyPath,
         Property $property,
-        mixed $value,
-        bool $validatePropertyConstraints = false
+        mixed $value
     ): CoerceResult|null;
 }
diff --git a/src/Service/Type/Coercer/BoolCoercer.php b/src/Service/Type/Coercer/BoolCoercer.php
@@ -30,7 +30,6 @@ public function coerce(
         string $propertyPath,
         Property $property,
         mixed $value,
-        bool $validatePropertyConstraints = false
     ): CoerceResult {
         if (!is_array($value)) {
             $value = [$value];
@@ -50,7 +49,6 @@ public function coerce(
             $property,
             $property->isCollection() ? $value : $value[0],
             [new Type(['type' => 'bool'])],
-            $validatePropertyConstraints
         );
     }
 }
diff --git a/src/Service/Type/Coercer/DateTimeImmutableCoercer.php b/src/Service/Type/Coercer/DateTimeImmutableCoercer.php
@@ -32,7 +32,6 @@ public function coerce(
         string $propertyPath,
         Property $property,
         mixed $value,
-        bool $validatePropertyConstraints = false
     ): CoerceResult {
         // php8
         $format = ($property->getFormat() ?? new Format())->format ?? $this->defaultDateFormat;

diff --git a/src/Service/Type/Coercer/EnumCoercer.php b/src/Service/Type/Coercer/EnumCoercer.php
@@ -48,7 +48,6 @@ public function coerce(
         string $propertyPath,
         Property $property,
         mixed $value,
-        bool $validatePropertyConstraints = false
     ): CoerceResult {
         $this->fromKey = $property->getDtoAttributes(FromKey::class)[0] ?? null;
 
@@ -63,10 +62,6 @@ public function coerce(
             ];
         }
 
-        if ($validatePropertyConstraints) {
-            $constraints = array_merge($constraints, $property->getConstraints());
-        }
-
         $violations = $this->validator->startContext()
             ->atPath($propertyPath)
             ->validate($value, $constraints)

diff --git a/src/Service/Type/Coercer/FloatCoercer.php b/src/Service/Type/Coercer/FloatCoercer.php
@@ -29,8 +29,7 @@ public function supports(
     public function coerce(
         string $propertyPath,
         Property $property,
-        mixed $value,
-        bool $validatePropertyConstraints = false
+        mixed $value
     ): CoerceResult {
         if (!is_array($value)) {
             $value = [$value];
@@ -48,7 +47,6 @@ public function coerce(
             $property,
             $property->isCollection() ? $value : $value[0],
             [new Type(['type' => 'float'])],
-            $validatePropertyConstraints
         );
     }
 }
diff --git a/src/Service/Type/Coercer/IntCoercer.php b/src/Service/Type/Coercer/IntCoercer.php
@@ -29,8 +29,7 @@ public function supports(
     public function coerce(
         string $propertyPath,
         Property $property,
-        mixed $value,
-        bool $validatePropertyConstraints = false
+        mixed $value
     ): CoerceResult {
         if (!is_array($value)) {
             $value = [$value];
@@ -48,7 +47,6 @@ public function coerce(
             $property,
             $property->isCollection() ? $value : $value[0],
             [new Type(['type' => 'int'])],
-            $validatePropertyConstraints
         );
     }
 }
diff --git a/src/Service/Type/Coercer/StringCoercer.php b/src/Service/Type/Coercer/StringCoercer.php
@@ -43,7 +43,6 @@ public function coerce(
             $property,
             $value, /** @phpstan-ignore-line */
             [new Type(['type' => 'string'])],
-            $validatePropertyConstraints
         );
     }
 }
diff --git a/src/Service/Type/Coercer/UploadedFileCoercer.php b/src/Service/Type/Coercer/UploadedFileCoercer.php
@@ -33,8 +33,7 @@ public function supports(
     public function coerce(
         string $propertyPath,
         Property $property,
-        mixed $value,
-        bool $validatePropertyConstraints = false
+        mixed $value
     ): CoerceResult {
         if (!is_array($value)) {
             $value = [$value];
@@ -46,7 +45,6 @@ public function coerce(
             $property,
             $property->isCollection() ? $value : $value[0] ?? null,
             [new Type(['type' => UploadedFile::class])],
-            $validatePropertyConstraints
         );
     }
 }
diff --git a/src/Service/Type/CoercerService.php b/src/Service/Type/CoercerService.php
@@ -46,22 +46,9 @@ public function supports(
     public function coerce(
         string $propertyPath,
         Property $property,
-        mixed $value,
-        bool $validatePropertyConstraints = false
+        mixed $value
     ): CoerceResult|null {
-        if (null === $value && !empty($property->getConstraints())) {
-            $violations = $this->validator->startContext()
-                ->atPath($propertyPath)
-                ->validate($value, $property->getConstraints())
-                ->getViolations();
-
-            if (0 !== $violations->count()) {
-                return new CoerceResult( // @phpstan-ignore-line
-                    null,
-                    $violations
-                );
-            }
-        } elseif ($property->isCollection()) {
+        if ($property->isCollection()) {
             $violations = $this->validator->startContext()
                 ->atPath($propertyPath)
                 ->validate($value, new Assert\Type(['type' => 'array']))

diff --git a/src/Traits/Type/CoercerResultTrait.php b/src/Traits/Type/CoercerResultTrait.php
@@ -27,7 +27,6 @@ private function buildResult(
         Property $property,
         mixed $value,
         array $constraints,
-        bool $validatePropertyConstraints = false
     ): CoerceResult {
         if ($property->isCollection()) {
             $constraints = [
@@ -37,10 +36,6 @@ private function buildResult(
             ];
         }
 
-        if ($validatePropertyConstraints) {
-            $constraints = array_merge($constraints, $property->getConstraints());
-        }
-
         $violations = $validator->startContext()
             ->atPath($propertyPath)
             ->validate($value, $constraints)