Merge branch 'master' into 2.2-merge

# Conflicts:
#	bin/release.sh
#	bin/split.sh
#	src/validation/src/Concerns/FormatsMessages.php

Author: limingxinleo

src/Concerns/ValidatesAttributes.php

@@ -58,7 +58,7 @@ public function validateActiveUrl(string $attribute, $value): bool
 
         if ($url = parse_url($value, PHP_URL_HOST)) {
             try {
-                return count(dns_get_record($url, DNS_A | DNS_AAAA)) > 0;
+                return count(dns_get_record($url . '.', DNS_A | DNS_AAAA)) > 0;
             } catch (Exception $e) {
                 return false;
             }
@@ -630,7 +630,7 @@ public function validateIn(string $attribute, $value, array $parameters): bool
             return count(array_diff($value, $parameters)) === 0;
         }
 
-        return ! is_array($value) && in_array((string) $value, $parameters);
+        return ! is_array($value) && in_array((string) $value, $parameters, true);
     }
 
     /**

src/Rules/RequiredIf.php

@@ -11,6 +11,8 @@
  */
 namespace Hyperf\Validation\Rules;
 
+use InvalidArgumentException;
+
 class RequiredIf
 {
     /**
@@ -27,7 +29,11 @@ class RequiredIf
      */
     public function __construct($condition)
     {
-        $this->condition = $condition;
+        if (! is_string($condition)) {
+            $this->condition = $condition;
+        } else {
+            throw new InvalidArgumentException('The provided condition must be a callable or boolean.');
+        }
     }
 
     /**

tests/Cases/ValidationValidatorTest.php

@@ -1823,6 +1823,10 @@ public function testValidateIn()
         $v = new Validator($trans, ['name' => 0], ['name' => 'In:bar,baz']);
         $this->assertFalse($v->passes());
 
+        $trans = $this->getIlluminateArrayTranslator();
+        $v = new Validator($trans, ['name' => 0], ['name' => 'In:00,000']);
+        $this->assertFalse($v->passes());
+
         $v = new Validator($trans, ['name' => 'foo'], ['name' => 'In:foo,baz']);
         $this->assertTrue($v->passes());