add Validator strict model and Required rule (#545)

add Validator strict model and Required rule
swoft-cloud · Jan 17, 2020 · a23799a · a23799a
2 parents 5d35972 + a3bdbd9
commit a23799a
Show file tree

Hide file tree

Showing 95 changed files with 687 additions and 117 deletions.
diff --git a/src/http-message/src/Request.php b/src/http-message/src/Request.php
@@ -81,6 +81,11 @@ class Request extends PsrRequest implements ServerRequestInterface
      */
     private $parsedQuery;
 
+    /**
+     * @var array|null
+     */
+    private $parsedPath;
+
     /**
      * @var array
      */
@@ -367,6 +372,15 @@ public function getParsedQuery(): array
         return $this->parsedQuery;
     }
 
+    /**
+     * @return array
+     */
+    public function getParsedPath(): array
+    {
+        return $this->parsedPath;
+    }
+
+
     /**
      * @param string $key
      * @param null   $default
@@ -380,6 +394,19 @@ public function parsedQuery(string $key, $default = null)
         return $parsedQuery[$key] ?? $default;
     }
 
+    /**
+     * @param string $key
+     * @param null $default
+     *
+     * @return mixed|null
+     */
+    public function parsedPath(string $key, $default = null)
+    {
+        $parsedPath = $this->getParsedPath();
+
+        return $parsedPath[$key] ?? $default;
+    }
+
     /**
      * @param array $query
      *
@@ -393,6 +420,19 @@ public function withParsedQuery(array $query): self
         return $clone;
     }
 
+    /**
+     * @param array $path
+     *
+     * @return Request
+     */
+    public function withParsedPath(array $path): self
+    {
+        $clone = clone $this;
+
+        $clone->parsedPath = $path;
+        return $clone;
+    }
+
     /**
      * @param string     $key
      * @param mixed|null $default

diff --git a/src/http-server/src/Middleware/ValidatorMiddleware.php b/src/http-server/src/Middleware/ValidatorMiddleware.php
@@ -52,6 +52,7 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
 
         $data  = $request->getParsedBody();
         $query = $request->getQueryParams();
+        $path = $route->getParams();
 
         // ParsedBody is empty string
         $parsedBody    = $data = empty($data) ? [] : $data;
@@ -64,13 +65,13 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $validator = BeanFactory::getBean('validator');
 
         /* @var Request $request */
-        [$parsedBody, $query] = $validator->validateRequest($parsedBody, $validates, $query);
+        [$parsedBody, $query, $path] = $validator->validateRequest($parsedBody, $validates, $query, $path);
 
         if ($notParsedBody) {
             $parsedBody = $data;
         }
 
-        $request = $request->withParsedBody($parsedBody)->withParsedQuery($query);
+        $request = $request->withParsedBody($parsedBody)->withParsedQuery($query)->withParsedPath($path);
 
         return $handler->handle($request);
     }

diff --git a/src/validator/src/Annotation/Mapping/AfterDate.php b/src/validator/src/Annotation/Mapping/AfterDate.php
@@ -63,4 +63,12 @@ public function getDate(): string
     {
         return $this->date;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/Alpha.php b/src/validator/src/Annotation/Mapping/Alpha.php
@@ -46,4 +46,12 @@ public function getMessage(): string
     {
         return $this->message;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/AlphaDash.php b/src/validator/src/Annotation/Mapping/AlphaDash.php
@@ -46,4 +46,12 @@ public function getMessage(): string
     {
         return $this->message;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/AlphaNum.php b/src/validator/src/Annotation/Mapping/AlphaNum.php
@@ -46,4 +46,12 @@ public function getMessage(): string
     {
         return $this->message;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/BeforeDate.php b/src/validator/src/Annotation/Mapping/BeforeDate.php
@@ -63,4 +63,12 @@ public function getDate(): string
     {
         return $this->date;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/Chs.php b/src/validator/src/Annotation/Mapping/Chs.php
@@ -46,4 +46,12 @@ public function getMessage(): string
     {
         return $this->message;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/ChsAlpha.php b/src/validator/src/Annotation/Mapping/ChsAlpha.php
@@ -47,4 +47,12 @@ public function getMessage(): string
     {
         return $this->message;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/ChsAlphaDash.php b/src/validator/src/Annotation/Mapping/ChsAlphaDash.php
@@ -46,4 +46,12 @@ public function getMessage(): string
     {
         return $this->message;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/ChsAlphaNum.php b/src/validator/src/Annotation/Mapping/ChsAlphaNum.php
@@ -46,4 +46,12 @@ public function getMessage(): string
     {
         return $this->message;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/Confirm.php b/src/validator/src/Annotation/Mapping/Confirm.php
@@ -63,4 +63,12 @@ public function getName(): string
     {
         return $this->name;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/Date.php b/src/validator/src/Annotation/Mapping/Date.php
@@ -46,4 +46,12 @@ public function getMessage(): string
     {
         return $this->message;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/DateRange.php b/src/validator/src/Annotation/Mapping/DateRange.php
@@ -79,4 +79,12 @@ public function getEnd(): string
     {
         return $this->end;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/Different.php b/src/validator/src/Annotation/Mapping/Different.php
@@ -63,4 +63,12 @@ public function getName(): string
     {
         return $this->name;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/Dns.php b/src/validator/src/Annotation/Mapping/Dns.php
@@ -46,4 +46,12 @@ public function getMessage(): string
     {
         return $this->message;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/Email.php b/src/validator/src/Annotation/Mapping/Email.php
@@ -47,4 +47,12 @@ public function getMessage(): string
     {
         return $this->message;
     }
-}
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
+}
diff --git a/src/validator/src/Annotation/Mapping/Enum.php b/src/validator/src/Annotation/Mapping/Enum.php
@@ -64,4 +64,12 @@ public function getValues(): array
     {
         return $this->values;
     }
-}
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
+}
diff --git a/src/validator/src/Annotation/Mapping/File.php b/src/validator/src/Annotation/Mapping/File.php
@@ -63,4 +63,12 @@ public function getName(): string
     {
         return $this->name;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/FileMediaType.php b/src/validator/src/Annotation/Mapping/FileMediaType.php
@@ -63,4 +63,12 @@ public function getMediaType(): array
     {
         return $this->mediaType;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/FileSize.php b/src/validator/src/Annotation/Mapping/FileSize.php
@@ -63,4 +63,12 @@ public function getSize(): int
     {
         return $this->size;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/FileSuffix.php b/src/validator/src/Annotation/Mapping/FileSuffix.php
@@ -63,4 +63,12 @@ public function getSuffix(): array
     {
         return $this->suffix;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/GreaterThan.php b/src/validator/src/Annotation/Mapping/GreaterThan.php
@@ -63,4 +63,12 @@ public function getName(): string
     {
         return $this->name;
     }
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
 }
diff --git a/src/validator/src/Annotation/Mapping/Ip.php b/src/validator/src/Annotation/Mapping/Ip.php
@@ -47,4 +47,12 @@ public function getMessage(): string
     {
         return $this->message;
     }
-}
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
+}
diff --git a/src/validator/src/Annotation/Mapping/IsArray.php b/src/validator/src/Annotation/Mapping/IsArray.php
@@ -63,4 +63,12 @@ public function getName(): string
     {
         return $this->name;
     }
-}
+
+    /**
+     * @param string $message
+     */
+    public function setMessage(string $message): void
+    {
+        $this->message = $message;
+    }
+}