Support validating arrays

Author: Sugavanas

.github/workflows/ci.yml

@@ -1,33 +1,30 @@
 name: CI
 
-on: [push]
+on: [ push ]
 
 jobs:
-  build-php-7-4:
+  tests:
+    name: Tests PHP ${{ matrix.php }}
     runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [ 7.3, 7.4, 8.0 ]
+        experimental: [ false ]
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: php-actions/composer@master
-      - name: PHPUnit Tests
-        uses: php-actions/phpunit@dynamic-docker
-        with:
-          bootstrap: vendor/autoload.php
-          configuration: tests/phpunit.xml
-          args: --coverage-text
-          php_version: 7.4
-          version: 9.5.0
-  build-php-8-0:
-    runs-on: ubuntu-latest
+      - name: Checkout
+        uses: actions/checkout@v2
 
-    steps:
-      - uses: actions/checkout@v2
-      - uses: php-actions/composer@master
-      - name: PHPUnit Tests
-        uses: php-actions/phpunit@dynamic-docker
+      - name: Set up PHP ${{ matrix.php }}
+        uses: shivammathur/setup-php@v2
         with:
-          bootstrap: vendor/autoload.php
-          configuration: tests/phpunit.xml
-          args: --coverage-text
-          php_version: 8.0
-          version: 9.5.0
+          php-version: ${{ matrix.php }}
+
+      - name: Install Composer dependencies
+        run: |
+          composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: Run Tests
+          run: php vendor/bin/phpunit --configuration tests\phpunit.xml

.idea/php.xml

@@ -32,17 +32,55 @@ public function __construct(array $config = [])
         $this->useSession = $config['useSession'] ?? false;
     }
 
+    /**
+     * @param Request|array $params
+     * @param array $rules
+     * @param mixed $default
+     * @return $this
+     * @throws \Exception
+     */
+    public function validate($params, array $rules, $default = null): Validator
+    {
+        if ($params instanceof Request) {
+            return $this->validateRequest($params, $rules, $default);
+        } elseif (is_array($params)) {
+            return $this->validateArray($params, $rules, $default);
+        }
+
+        throw new \Exception('Unknown type given for $params.');
+    }
+
     /**
      * @param Request $request
      * @param array $rules
-     * @param null $default
+     * @param mixed $default
      * @return $this
      */
-    public function validate(Request $request, array $rules, $default = null): Validator
+    public function validateRequest(Request $request, array $rules, $default = null)
     {
-        //$this->values = [];
-        //$this->errors = [];
         $params = $request->getParsedBody();
+        return $this->runValidation($params, $rules, $default);
+    }
+
+    /**
+     * @param array $params
+     * @param array $rules
+     * @param mixed $default
+     * @return $this
+     */
+    public function validateArray(array $params, array $rules, $default = null)
+    {
+        return $this->runValidation($params, $rules, $default);
+    }
+
+    /**
+     * @param array $params
+     * @param array $rules
+     * @param mixed $default
+     * @return Validator
+     */
+    protected function runValidation(array $params, array $rules, $default = null)
+    {
         foreach ($rules as $field => $rule) {
             try {
                 $param = isset($params[$field]) ? $params[$field] : $default;
@@ -57,7 +95,6 @@ public function validate(Request $request, array $rules, $default = null): Valid
             $_SESSION['TS_PHPValidator_Errors'] = $this->errors;
             $_SESSION['TS_PHPValidator_Values'] = $this->values;
         }
-
         return $this;
     }
 

src/Validator.php

@@ -41,6 +41,28 @@ public function testNonValidRequest()
         $this->assertTrue($v->failed());
     }
 
+    public function testValidArray()
+    {
+        $array = ["email" => "[email protected]", "password" => "Abcd1234_"];
+        $v = (new Validator())->validate($array, [
+            'email' => v::noWhitespace()->notEmpty()->email(),
+            'password' => v::noWhitespace()->notEmpty()->length(8)->alnum('_')
+        ]);
+
+        $this->assertTrue($v->isValid());
+    }
+
+    public function testNonValidArray()
+    {
+        $array = ["email" => "example", "password" => "1234"];
+        $v = (new Validator())->validate($array, [
+            'email' => v::noWhitespace()->notEmpty()->email(),
+            'password' => v::noWhitespace()->notEmpty()->length(8)->alnum('_')
+        ]);
+
+        $this->assertTrue($v->failed());
+    }
+
     public function testMiddleware()
     {
         $config = [
@@ -113,7 +135,8 @@ protected function createServerRequest(
         string $uri,
         string $method = 'GET',
         array $data = []
-    ): Request {
+    ): Request
+    {
         $headers = [
             'HTTP_ACCEPT' => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
             'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1,utf-8;q=0.7,*;q=0.3',

tests/PHPValidatorTest.php

@@ -5,10 +5,4 @@
             <directory suffix="Test.php">.</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">../src</directory>
-        </whitelist>
-    </filter>
 </phpunit>