upsome

Author: inhere

.github/workflows/php.yml

@@ -0,0 +1,41 @@
+name: Unit-tests
+
+on: [push]
+
+jobs:
+  test:
+    name: Test on php ${{ matrix.php}} and ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 10
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [7.1, 7.2, 7.3, 7.4] #
+        os: [ubuntu-latest] # windows-latest, macOS-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      # usage refer https://github.com/shivammathur/setup-php
+      - name: Setup PHP
+        timeout-minutes: 5
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php}}
+          tools: pecl, php-cs-fixer, phpunit
+          extensions: mbstring, dom, fileinfo, mysql, openssl, igbinary, redis # , swoole-4.4.19 #optional, setup extensions
+          ini-values: post_max_size=56M, short_open_tag=On #optional, setup php.ini configuration
+          coverage: none #optional, setup coverage driver: xdebug, none
+
+      - name: Display Env
+        run: env
+
+      - name: Install dependencies
+        run: composer install --no-progress --no-suggest
+
+      # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+      # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+      - name: Run test suite
+        run: composer run test

composer.json

@@ -36,6 +36,7 @@
   },
   "scripts": {
     "check-cs": "./php-cs-fixer fix --dry-run --diff --diff-format=udiff",
-    "cs-fix": "./php-cs-fixer fix"
+    "cs-fix": "./php-cs-fixer fix",
+    "test": "vendor/bin/phpunit"
   }
 }

src/ArrayValueNotExists.php

@@ -0,0 +1,12 @@
+<?php declare(strict_types=1);
+
+namespace Inhere\Validate\Exception;
+
+/**
+ * Class ArrayValueNotExists
+ *
+ * @package Inhere\Validate\Exception
+ */
+final class ArrayValueNotExists
+{
+}

src/Exception/ArrayValueNotExists.php

@@ -0,0 +1,43 @@
+<?php declare(strict_types=1);
+
+namespace Inhere\Validate\Exception;
+
+use RuntimeException;
+
+/**
+ * Class ValidateException
+ *
+ * @package Inhere\Validate\Exception
+ */
+class ValidateException extends RuntimeException
+{
+    /**
+     * @var string
+     */
+    public $field;
+
+    /**
+     * @param string $field
+     * @param string $message
+     *
+     * @return static
+     */
+    public static function create(string $field, string $message): self
+    {
+        return new self($field, $message);
+    }
+
+    /**
+     * Class constructor.
+     *
+     * @param string $field
+     * @param string $message
+     */
+    public function __construct(string $field, string $message)
+    {
+        parent::__construct($field . ' ' . $message, 500);
+
+        // save field
+        $this->field = $field;
+    }
+}

src/Exception/ValidateException.php

@@ -0,0 +1,18 @@
+<?php declare(strict_types=1);
+
+namespace Inhere\Validate;
+
+/**
+ * Class GlobalOption TODO
+ *
+ * @package Inhere\Validate
+ */
+final class GlobalOption
+{
+    /**
+     * Prettify field name on get error message
+     *
+     * @var bool
+     */
+    public static $prettifyName = true;
+}

src/GlobalOption.php

@@ -60,7 +60,7 @@ trait ErrorMessageTrait
     private $_stopOnError = true;
 
     /**
-     * prettify field name on get error message
+     * Prettify field name on get error message
      *
      * @var bool
      */

src/Traits/ErrorMessageTrait.php

@@ -2,6 +2,7 @@
 
 namespace Inhere\Validate;
 
+use Inhere\Validate\Exception\ValidateException;
 use function array_merge;
 use function is_int;
 use function is_numeric;

src/Valid.php

@@ -2,42 +2,12 @@
 
 namespace Inhere\Validate;
 
-use RuntimeException;
-
 /**
  * Class ValidateException
  *
  * @package Inhere\Validate
+ * @deprecated please use Inhere\Validate\Exception\ValidateException
  */
-class ValidateException extends RuntimeException
+class ValidateException extends Exception\ValidateException
 {
-    /**
-     * @var string
-     */
-    public $field;
-
-    /**
-     * @param string $field
-     * @param string $message
-     *
-     * @return static
-     */
-    public static function create(string $field, string $message): self
-    {
-        return new self($field, $message);
-    }
-
-    /**
-     * Class constructor.
-     *
-     * @param string $field
-     * @param string $message
-     */
-    public function __construct(string $field, string $message)
-    {
-        parent::__construct($field . ' ' . $message, 500);
-
-        // save field
-        $this->field = $field;
-    }
 }

src/ValidateException.php

@@ -10,6 +10,7 @@
 
 use Closure;
 use Generator;
+use Inhere\Validate\Exception\ArrayValueNotExists;
 use Inhere\Validate\Filter\FilteringTrait;
 use Inhere\Validate\Filter\Filters;
 use Inhere\Validate\Traits\ErrorMessageTrait;

src/ValidationTrait.php

@@ -9,6 +9,7 @@
 
 namespace Inhere\Validate;
 
+use Inhere\Validate\Exception\ArrayValueNotExists;
 use Inhere\Validate\Traits\NameAliasTrait;
 use function array_diff;
 use function array_key_exists;

src/Validators.php

@@ -65,7 +65,6 @@ public function testErrorMessage(): void
 
         // prettifyName
         $v->setPrettifyName(false);
-
         $this->assertFalse($v->isPrettifyName());
 
         // re-validate