fix: swoft-cloud/swoft/issues/1266

filx validator has no effect on not required param.
swoft-cloud · Apr 24, 2020 · 18aeabf · 18aeabf
1 parent cfc0927
commit 18aeabf
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/validator/src/Validator.php b/src/validator/src/Validator.php
@@ -177,6 +177,17 @@ protected function validateDefaultValidator(array $data, array $validator, array
     {
         $properties = $validator['properties'] ?? [];
         foreach ($properties as $propName => $property) {
+            /* @var IsString|IsInt|IsBool|IsFloat $type */
+            $type        = $property['type']['annotation'] ?? null;
+            $default     = $property['type']['default'] ?? null;
+            $annotations = $property['annotations'] ?? [];
+            if ($type === null) {
+                continue;
+            }
+
+            $name     = $type->getName();
+            $propName = empty($name) ? $propName : $name;
+
             if (!empty($fields) && !in_array($propName, $fields, true)) {
                 continue;
             }
@@ -190,17 +201,6 @@ protected function validateDefaultValidator(array $data, array $validator, array
                 continue;
             }
 
-            /* @var IsString|IsInt|IsBool|IsFloat $type */
-            $type        = $property['type']['annotation'] ?? null;
-            $default     = $property['type']['default'] ?? null;
-            $annotations = $property['annotations'] ?? [];
-            if ($type === null) {
-                continue;
-            }
-
-            $name     = $type->getName();
-            $propName = empty($name) ? $propName : $name;
-
             // Default validate item(Type) and other item
             $data = $this->validateDefaultItem($data, $propName, $type, $default);
             foreach ($annotations as $annotation) {