fix unit tests error for validator

swoft-cloud · Sep 13, 2020 · d966759 · d966759
1 parent c71918a
commit d966759
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/validator/src/Annotation/Parser/ValidateParser.php b/src/validator/src/Annotation/Parser/ValidateParser.php
@@ -35,7 +35,7 @@ public function parse(int $type, $annotationObject): array
         $validator = $annotationObject->getValidator();
         $fields    = $annotationObject->getFields();
         $params    = $annotationObject->getParams();
-        $type      = $annotationObject->getType();
+        $dataType  = $annotationObject->getType();
         $unfields  = $annotationObject->getUnfields();
 
         ValidateRegister::registerValidate(
@@ -46,7 +46,7 @@ public function parse(int $type, $annotationObject): array
             $unfields,
             $params,
             '',
-            $type
+            $dataType
         );
 
         return [];

diff --git a/src/validator/src/Validator.php b/src/validator/src/Validator.php
@@ -184,24 +184,25 @@ protected function doValidate(
     protected function validateDefaultValidator(array $data, array $validator, array $fields, array $unfields): array
     {
         $properties = $validator['properties'] ?? [];
+
         foreach ($properties as $propName => $property) {
             /* @var IsString|IsInt|IsBool|IsFloat $type */
             $type = $property['type']['annotation'] ?? null;
             if ($type === null) {
                 continue;
             }
 
-            $propName = $type->getName() ?: $propName;
             if ($fields && !in_array($propName, $fields, true)) {
                 continue;
             }
 
-            if (!isset($data[$propName]) && !$property['required'] && !isset($property['type']['default'])) {
+            // Un-fields - exclude validate
+            if (in_array($propName, $unfields, true)) {
                 continue;
             }
 
-            // Unfields
-            if (in_array($propName, $unfields, true)) {
+            $propName = $type->getName() ?: $propName;
+            if (!isset($data[$propName]) && !$property['required'] && !isset($property['type']['default'])) {
                 continue;
             }
 

diff --git a/src/validator/test/unit/ValidatorTypeTest.php b/src/validator/test/unit/ValidatorTypeTest.php
@@ -161,8 +161,9 @@ public function testDefault(): void
     public function testName(): void
     {
         $data = [];
-        [$result] = (new Validator())->validateRequest($data, $this->getValidates(ValidateDemo::class, 'testName'));
-        $this->assertEquals($result, ['swoftName' => 'swoft']);
+        $validates = $this->getValidates(ValidateDemo::class, 'testName');
+        [$result] = (new Validator())->validateRequest($data, $validates);
+        $this->assertEquals(['swoftName' => 'swoft'], $result);
     }
 
     /**