Merge branch 'master' into 3.0-merge

# Conflicts:
#	src/rpn/src/Calculator.php

Author: limingxinleo

.github/workflows/close-pull-request.yml

@@ -0,0 +1,13 @@
+name: Close Pull Request
+
+on:
+  pull_request_target:
+    types: [opened]
+
+jobs:
+  run:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: superbrothers/close-pull-request@v3
+        with:
+          comment: "Hi, this is a READ-ONLY repository, please submit your PR on the https://github.com/hyperf/hyperf repository.<br><br> This Pull Request will close automatically.<br><br> Thanks! "

src/Concerns/ValidatesAttributes.php

@@ -167,9 +167,17 @@ public function validateAlphaNum(string $attribute, $value): bool
      *
      * @param mixed $value
      */
-    public function validateArray(string $attribute, $value): bool
+    public function validateArray(string $attribute, $value, array $parameters = []): bool
     {
-        return is_array($value);
+        if (! is_array($value)) {
+            return false;
+        }
+
+        if (empty($parameters)) {
+            return true;
+        }
+
+        return empty(array_diff_key($value, array_fill_keys($parameters, '')));
     }
 
     /**

tests/Cases/ValidationFactoryTest.php

@@ -110,7 +110,7 @@ public function testValidateMethodCanBeCalledPublicly()
         $translator = m::mock(TranslatorInterface::class);
         $factory = new ValidatorFactory($translator);
         $factory->extend('foo', function ($attribute, $value, $parameters, $validator) {
-            return $validator->validateArray($attribute, $value);
+            return $validator->validateArray($attribute, $value, $parameters);
         });
 
         $validator = $factory->make(['bar' => ['baz']], ['bar' => 'foo']);

tests/Cases/ValidationValidatorTest.php

@@ -650,6 +650,15 @@ public function testValidateArray()
 
         $v = new Validator($trans, ['foo' => new SplFileInfo('/tmp/foo')], ['foo' => 'Array']);
         $this->assertFalse($v->passes());
+
+        $v = new Validator($trans, ['foo' => ['name' => 'foo', 'gender' => 1, 'vote' => 1]], ['foo' => 'Array:name,gender']);
+        $this->assertFalse($v->passes());
+
+        $v = new Validator($trans, ['foo' => ['name' => 'foo', 'gender' => 1]], ['foo' => 'Array:name,gender']);
+        $this->assertTrue($v->passes());
+
+        $v = new Validator($trans, ['foo' => ['name' => 'foo', 'gender' => 1]], ['foo' => 'Array:name,gender,vote']);
+        $this->assertTrue($v->passes());
     }
 
     public function testValidateFilled()
@@ -3468,6 +3477,22 @@ public function testValidateImplicitEachWithAsterisks()
             ['foo' => 'Array', 'foo.*.name' => ['Required', 'String'], 'foo.*.votes.*' => ['Required', 'Integer']]
         );
         $this->assertFalse($v->passes());
+
+        // multiple items fields passes
+        $v = new Validator(
+            $trans,
+            ['foo' => [['name' => 'first'], ['name' => 'second']]],
+            ['foo' => 'Array', 'foo.*' => 'Array:name', 'foo.*.name' => ['Required']]
+        );
+        $this->assertTrue($v->passes());
+
+        // multiple items fields fails
+        $v = new Validator(
+            $trans,
+            ['foo' => [['name' => 'first', 'votes' => 1], ['name' => 'second', 'votes' => 2]]],
+            ['foo' => 'Array', 'foo.*' => 'Array:name', 'foo.*.name' => ['Required']]
+        );
+        $this->assertFalse($v->passes());
     }
 
     public function testSometimesOnArraysInImplicitRules()