up: update some for run on php8.4

inhere · inhere · commit 6ba17801d91e · 2025-04-20T16:53:57.000+08:00
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -11,18 +11,17 @@ on:
 
 jobs:
   test:
-    name: Test on php ${{ matrix.php}} and ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: Test on php ${{ matrix.php}}
+    runs-on: ubuntu-latest
     timeout-minutes: 10
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.1, 8.2] # 7.1, 7.2,
-        os: [ubuntu-latest] # windows-latest, macOS-latest
+        php: [ 8.1, 8.2, 8.3, 8.4] # 7.1, 7.2,
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # usage refer https://github.com/shivammathur/setup-php
       - name: Setup PHP
@@ -46,4 +45,4 @@ jobs:
 
       - name: Run unit tests
         # run: composer run test
-        run: phpunit -vv
+        run: phpunit
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,17 +7,15 @@ on:
 
 jobs:
   release:
-    name: Test on php ${{ matrix.php}}
+    name: New tag release
     runs-on: ubuntu-latest
     timeout-minutes: 10
     strategy:
       fail-fast: true
-      matrix:
-        php: [8.1]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -35,7 +33,7 @@ jobs:
 
       # https://github.com/softprops/action-gh-release
       - name: Create release and upload assets
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ composer.lock
 *.swo
 .DS_Store
 .phpunit.result.cache
+*.cache
diff --git a/README.en.md b/README.en.md
@@ -1,7 +1,7 @@
 # PHP Validate
 
 [![License](https://img.shields.io/packagist/l/inhere/php-validate.svg?style=flat-square)](LICENSE)
-[![Php Version](https://img.shields.io/badge/php-%3E=8.1-brightgreen.svg?maxAge=2592000)](https://packagist.org/packages/inhere/php-validate)
+[![Php Version](https://img.shields.io/packagist/php-v/inhere/php-validate?maxAge=2592000)](https://packagist.org/packages/inhere/php-validate)
 [![Latest Stable Version](http://img.shields.io/packagist/v/inhere/php-validate.svg)](https://packagist.org/packages/inhere/php-validate)
 [![Coverage Status](https://coveralls.io/repos/github/inhere/php-validate/badge.svg?branch=master)](https://coveralls.io/github/inhere/php-validate?branch=master)
 [![Github Actions Status](https://github.com/inhere/php-validate/workflows/Unit-tests/badge.svg)](https://github.com/inhere/php-validate/actions)
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # PHP Validate
 
 [![License](https://img.shields.io/packagist/l/inhere/php-validate.svg?style=flat-square)](LICENSE)
-[![Php Version](https://img.shields.io/badge/php-%3E=8.1-brightgreen.svg?maxAge=2592000)](https://packagist.org/packages/inhere/php-validate)
+[![Php Version](https://img.shields.io/packagist/php-v/inhere/php-validate?maxAge=2592000)](https://packagist.org/packages/inhere/php-validate)
 [![Latest Stable Version](http://img.shields.io/packagist/v/inhere/php-validate.svg)](https://packagist.org/packages/inhere/php-validate)
 [![Coverage Status](https://coveralls.io/repos/github/inhere/php-validate/badge.svg?branch=master)](https://coveralls.io/github/inhere/php-validate?branch=master)
 [![Github Actions Status](https://github.com/inhere/php-validate/workflows/Unit-tests/badge.svg)](https://github.com/inhere/php-validate/actions)
diff --git a/composer.json b/composer.json
@@ -22,9 +22,7 @@
     "php": ">8.1.0",
     "toolkit/stdlib": "~2.0"
   },
-  "require-dev": {
-    "phpunit/phpunit": "^9.5"
-  },
+  "require-dev": {},
   "autoload": {
     "psr-4": {
       "Inhere\\Validate\\": "src/"
diff --git a/phpunit.xml b/phpunit.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" backupGlobals="false" bootstrap="test/bootstrap.php" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.1/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Php Package Test Suite">
+      <directory>test</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
diff --git a/src/AbstractValidation.php b/src/AbstractValidation.php
@@ -26,7 +26,7 @@ abstract class AbstractValidation implements ValidationInterface
     /**
      * @var array
      */
-    protected $data = [];
+    protected array $data = [];
 
     /**
      * @param array  $data
diff --git a/src/Filter/Filters.php b/src/Filter/Filters.php
@@ -156,7 +156,7 @@ public static function abs(mixed $val): int
      *
      * @return int|float
      */
-    public static function float(mixed $val, int $decimal = null, int|string $flags = FILTER_FLAG_ALLOW_FRACTION): int|float
+    public static function float(mixed $val, ?int $decimal = null, int|string $flags = FILTER_FLAG_ALLOW_FRACTION): int|float
     {
         $options = (int)$flags !== 0 ? ['flags' => (int)$flags] : [];
 
@@ -509,7 +509,7 @@ public static function str2array(string $string, string $delimiter = ',', int $l
      *
      * @return string
      */
-    public static function clearTags(mixed $val, string $allowedTags = null): string
+    public static function clearTags(mixed $val, ?string $allowedTags = null): string
     {
         return self::stripTags($val, $allowedTags);
     }
@@ -520,7 +520,7 @@ public static function clearTags(mixed $val, string $allowedTags = null): string
      *
      * @return string
      */
-    public static function stripTags(mixed $val, string $allowedTags = null): string
+    public static function stripTags(mixed $val, ?string $allowedTags = null): string
     {
         if (!$val || !is_string($val)) {
             return '';
diff --git a/src/Simple/ValidData.php b/src/Simple/ValidData.php
@@ -80,7 +80,7 @@ public static function reset(): void
      *
      * @return int
      */
-    public static function getInt(string $field, int $min = null, ?int $max = null, ?int $default = null): int
+    public static function getInt(string $field, ?int $min = null, ?int $max = null, ?int $default = null): int
     {
         if (!isset(self::$data[$field])) {
             if ($default === null) {
@@ -110,7 +110,7 @@ public static function getInt(string $field, int $min = null, ?int $max = null,
      *
      * @return array
      */
-    public static function getInts(string $field, int $min = null, int $max = null, array $default = null): array
+    public static function getInts(string $field, ?int $min = null, ?int $max = null, ?array $default = null): array
     {
         $arr = self::getArray($field, $min, $max, $default);
 
@@ -126,7 +126,7 @@ public static function getInts(string $field, int $min = null, int $max = null,
      *
      * @return array
      */
-    public static function getIntsBySplit(string $field, int $min = null, int $max = null, array $default = null, string $sep = ','): array
+    public static function getIntsBySplit(string $field, ?int $min = null, ?int $max = null, ?array $default = null, string $sep = ','): array
     {
         $arr = self::getArrayBySplit($field, $min, $max, $default, $sep);
 
@@ -141,7 +141,7 @@ public static function getIntsBySplit(string $field, int $min = null, int $max =
      *
      * @return float
      */
-    public static function getFloat(string $field, float $min = null, float $max = null, float $default = null): float
+    public static function getFloat(string $field, ?float $min = null, ?float $max = null, ?float $default = null): float
     {
         if (!isset(self::$data[$field])) {
             if ($default === null) {
@@ -173,7 +173,7 @@ public static function getFloat(string $field, float $min = null, float $max = n
      *
      * @return string
      */
-    public static function getString(string $field, int $minLen = null, int $maxLen = null, string $default = null): string
+    public static function getString(string $field, ?int $minLen = null, ?int $maxLen = null, ?string $default = null): string
     {
         if (!isset(self::$data[$field])) {
             if ($default === null) {
@@ -206,7 +206,7 @@ public static function getString(string $field, int $minLen = null, int $maxLen
      *
      * @return array
      */
-    public static function getStrings(string $field, int $min = null, int $max = null, array $default = null): array
+    public static function getStrings(string $field, ?int $min = null, ?int $max = null, ?array $default = null): array
     {
         if (!isset(self::$data[$field])) {
             if ($default === null) {
@@ -244,7 +244,7 @@ public static function getStrings(string $field, int $min = null, int $max = nul
      *
      * @return array
      */
-    public static function getArray(string $field, int $min = null, int $max = null, array $default = null): array
+    public static function getArray(string $field, ?int $min = null, ?int $max = null, ?array $default = null): array
     {
         if (!isset(self::$data[$field])) {
             if ($default === null) {
@@ -280,7 +280,7 @@ public static function getArray(string $field, int $min = null, int $max = null,
      *
      * @return array
      */
-    public static function getArrayBySplit(string $field, int $min = null, int $max = null, array $default = null, string $sep = ','): array
+    public static function getArrayBySplit(string $field, ?int $min = null, ?int $max = null, ?array $default = null, string $sep = ','): array
     {
         if (!isset(self::$data[$field])) {
             if ($default === null) {
@@ -315,7 +315,7 @@ public static function getArrayBySplit(string $field, int $min = null, int $max
      *
      * @return array
      */
-    public static function getArrayByJSON(string $field, int $min = null, int $max = null, array $default = null): array
+    public static function getArrayByJSON(string $field, ?int $min = null, ?int $max = null, ?array $default = null): array
     {
         if (!isset(self::$data[$field])) {
             if ($default === null) {
@@ -359,7 +359,7 @@ public static function getArrayByJSON(string $field, int $min = null, int $max =
      *
      * @return string
      */
-    public static function fmtMinMaxToMsg(string $prefix, int $min = null, int $max = null, string $sepMsg = 'and'): string
+    public static function fmtMinMaxToMsg(string $prefix, ?int $min = null, ?int $max = null, string $sepMsg = 'and'): string
     {
         if ($min !== null && $max !== null) {
             return "$prefix $sepMsg must be >= $min and <= $max";
diff --git a/src/Traits/NameAliasTrait.php b/src/Traits/NameAliasTrait.php
@@ -15,7 +15,7 @@
  */
 trait NameAliasTrait
 {
-    /** @var array Name aliases map. please define on main-class */
+    /* var array Name aliases map. please define on main-class */
     // protected static $aliases = [];
 
     /**
diff --git a/src/Traits/ScopedValidatorsTrait.php b/src/Traits/ScopedValidatorsTrait.php
@@ -8,9 +8,11 @@
 
 namespace Inhere\Validate\Traits;
 
+use Inhere\Validate\AbstractValidation;
 use Inhere\Validate\Filter\Filters;
 use Inhere\Validate\Helper;
 use Inhere\Validate\Validators;
+use Inhere\ValidateTest\Example\DataModel;
 use InvalidArgumentException;
 use function array_shift;
 use function function_exists;
@@ -33,7 +35,7 @@
  */
 trait ScopedValidatorsTrait
 {
-    /** @var array user custom add's validators(current scope) */
+    /** @var array user custom adds validators(current scope) */
     protected array $_validators = [];
 
     /**
@@ -61,7 +63,7 @@ trait ScopedValidatorsTrait
      * @param callable $callback
      * @param string   $message
      *
-     * @return $this
+     * @return AbstractValidation|ScopedValidatorsTrait|DataModel
      */
     public function addValidator(string $name, callable $callback, string $message = ''): self
     {
@@ -75,7 +77,7 @@ public function addValidator(string $name, callable $callback, string $message =
      * @param callable $callback
      * @param string   $message
      *
-     * @return self
+     * @return static
      */
     public function setValidator(string $name, callable $callback, string $message = ''): self
     {
diff --git a/src/ValidationInterface.php b/src/ValidationInterface.php
@@ -40,7 +40,7 @@ public function translates(): array;
      *
      * @return static
      */
-    public function validate(array $onlyChecked = [], bool $stopOnError = null): static;
+    public function validate(array $onlyChecked = [], ?bool $stopOnError = null): static;
 
     /**
      * alias of the fail()
diff --git a/src/ValidationTrait.php b/src/ValidationTrait.php
@@ -198,7 +198,7 @@ public function afterValidate(): void
      *
      * @return static
      */
-    public function validate(array $onlyChecked = [], bool $stopOnError = null): static
+    public function validate(array $onlyChecked = [], ?bool $stopOnError = null): static
     {
         if (!property_exists($this, 'data')) {
             throw new InvalidArgumentException('Must be defined property "data"(array) in the sub-class used.');

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public static function abs(mixed $val): int`
`156`	`156`	`*`
`157`	`157`	`* @return int\|float`
`158`	`158`	`*/`
`159`		`- public static function float(mixed $val, int $decimal = null, int\|string $flags = FILTER_FLAG_ALLOW_FRACTION): int\|float`
	`159`	`+ public static function float(mixed $val, ?int $decimal = null, int\|string $flags = FILTER_FLAG_ALLOW_FRACTION): int\|float`
`160`	`160`	`{`
`161`	`161`	`$options = (int)$flags !== 0 ? ['flags' => (int)$flags] : [];`
`162`	`162`
`@@ -509,7 +509,7 @@ public static function str2array(string $string, string $delimiter = ',', int $l`
`509`	`509`	`*`
`510`	`510`	`* @return string`
`511`	`511`	`*/`
`512`		`- public static function clearTags(mixed $val, string $allowedTags = null): string`
	`512`	`+ public static function clearTags(mixed $val, ?string $allowedTags = null): string`
`513`	`513`	`{`
`514`	`514`	`return self::stripTags($val, $allowedTags);`
`515`	`515`	`}`
`@@ -520,7 +520,7 @@ public static function clearTags(mixed $val, string $allowedTags = null): string`
`520`	`520`	`*`
`521`	`521`	`* @return string`
`522`	`522`	`*/`
`523`		`- public static function stripTags(mixed $val, string $allowedTags = null): string`
	`523`	`+ public static function stripTags(mixed $val, ?string $allowedTags = null): string`
`524`	`524`	`{`
`525`	`525`	`if (!$val \|\| !is_string($val)) {`
`526`	`526`	`return '';`