Refactor test providers and constructor property visibility (#7444)

Author: huangdijia

tests/Cases/ValidationEnumRuleTest.php

@@ -149,6 +149,16 @@ public function testValidationPassesWhenExceptCasesProvided(
         $this->assertSame($expected, $v->fails());
     }
 
+    public static function conditionalCasesDataProvider(): array
+    {
+        return [
+            [IntegerStatus::done, IntegerStatus::done, true],
+            [IntegerStatus::done, [IntegerStatus::done, IntegerStatus::pending], true],
+            [IntegerStatus::pending->value, [IntegerStatus::done, IntegerStatus::pending], true],
+            [IntegerStatus::done->value, IntegerStatus::pending, false],
+        ];
+    }
+
     public function testOnlyHasHigherOrderThanExcept(): void
     {
         $v = new Validator(
@@ -271,16 +281,6 @@ public function testValidationFailsWhenProvidingStringToIntegerType(): void
         $this->assertEquals(['The selected status is invalid.'], $v->messages()->get('status'));
     }
 
-    public static function conditionalCasesDataProvider(): array
-    {
-        return [
-            [IntegerStatus::done, IntegerStatus::done, true],
-            [IntegerStatus::done, [IntegerStatus::done, IntegerStatus::pending], true],
-            [IntegerStatus::pending->value, [IntegerStatus::done, IntegerStatus::pending], true],
-            [IntegerStatus::done->value, IntegerStatus::pending, false],
-        ];
-    }
-
     private function getTranslator(): Translator
     {
         return new Translator(

tests/Cases/ValidationValidatorTest.php

@@ -2893,17 +2893,6 @@ public function testValidateUrlWithValidUrls($validUrl)
         $this->assertTrue($v->passes());
     }
 
-    /**
-     * @param mixed $invalidUrl
-     */
-    #[DataProvider('invalidUrls')]
-    public function testValidateUrlWithInvalidUrls($invalidUrl)
-    {
-        $trans = $this->getIlluminateArrayTranslator();
-        $v = new Validator($trans, ['x' => $invalidUrl], ['x' => 'Url']);
-        $this->assertFalse($v->passes());
-    }
-
     public static function validUrls()
     {
         return [
@@ -3146,6 +3135,17 @@ public static function validUrls()
         ];
     }
 
+    /**
+     * @param mixed $invalidUrl
+     */
+    #[DataProvider('invalidUrls')]
+    public function testValidateUrlWithInvalidUrls($invalidUrl)
+    {
+        $trans = $this->getIlluminateArrayTranslator();
+        $v = new Validator($trans, ['x' => $invalidUrl], ['x' => 'Url']);
+        $this->assertFalse($v->passes());
+    }
+
     public static function invalidUrls()
     {
         return [
@@ -5299,17 +5299,6 @@ public function testValidateWithValidUuid($uuid)
         $this->assertTrue($v->passes());
     }
 
-    /**
-     * @param mixed $uuid
-     */
-    #[DataProvider('invalidUuidList')]
-    public function testValidateWithInvalidUuid($uuid)
-    {
-        $trans = $this->getIlluminateArrayTranslator();
-        $v = new Validator($trans, ['foo' => $uuid], ['foo' => 'uuid']);
-        $this->assertFalse($v->passes());
-    }
-
     public static function validUuidList()
     {
         return [
@@ -5326,6 +5315,17 @@ public static function validUuidList()
         ];
     }
 
+    /**
+     * @param mixed $uuid
+     */
+    #[DataProvider('invalidUuidList')]
+    public function testValidateWithInvalidUuid($uuid)
+    {
+        $trans = $this->getIlluminateArrayTranslator();
+        $v = new Validator($trans, ['foo' => $uuid], ['foo' => 'uuid']);
+        $this->assertFalse($v->passes());
+    }
+
     public static function invalidUuidList()
     {
         return [