Fixes rakit/validation#132

gdarko · gdarko · commit 9f89973f8c99 · 2022-07-03T23:05:16.000+02:00
diff --git a/tests/Fixtures/Even.php b/tests/Fixtures/Even.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Fixtures;
 
 use IgniteKit\Validation\Rule;
 
diff --git a/tests/Fixtures/Required.php b/tests/Fixtures/Required.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Fixtures;
 
 use IgniteKit\Validation\Rule;
 
diff --git a/tests/Rules/AcceptedTest.php b/tests/Rules/AcceptedTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Accepted;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/AfterTest.php b/tests/Rules/AfterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\After;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/AlphaDashTest.php b/tests/Rules/AlphaDashTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\AlphaDash;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/AlphaNumTest.php b/tests/Rules/AlphaNumTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\AlphaNum;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/AlphaSpacesTest.php b/tests/Rules/AlphaSpacesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\AlphaSpaces;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/AlphaTest.php b/tests/Rules/AlphaTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Alpha;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/BeforeTest.php b/tests/Rules/BeforeTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Before;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/BetweenTest.php b/tests/Rules/BetweenTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Between;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/BooleanTest.php b/tests/Rules/BooleanTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Boolean;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/CallbackTest.php b/tests/Rules/CallbackTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Callback;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/DateTest.php b/tests/Rules/DateTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Date;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/DefaultsTest.php b/tests/Rules/DefaultsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Defaults;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/DigitsBetweenTest.php b/tests/Rules/DigitsBetweenTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\DigitsBetween;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/DigitsTest.php b/tests/Rules/DigitsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Digits;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/EmailTest.php b/tests/Rules/EmailTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Email;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/ExtensionTest.php b/tests/Rules/ExtensionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Extension;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/InTest.php b/tests/Rules/InTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\In;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/IntegerTest.php b/tests/Rules/IntegerTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Integer;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/IpTest.php b/tests/Rules/IpTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Ip;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/Ipv4Test.php b/tests/Rules/Ipv4Test.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Ipv4;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/Ipv6Test.php b/tests/Rules/Ipv6Test.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Ipv6;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/JsonTest.php b/tests/Rules/JsonTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Json;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/LowercaseTest.php b/tests/Rules/LowercaseTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Lowercase;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/MaxTest.php b/tests/Rules/MaxTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Max;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/MimesTest.php b/tests/Rules/MimesTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Mimes;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/MinTest.php b/tests/Rules/MinTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Min;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/NotInTest.php b/tests/Rules/NotInTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\NotIn;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/NumericTest.php b/tests/Rules/NumericTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Numeric;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/RegexTest.php b/tests/Rules/RegexTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Regex;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/RequiredTest.php b/tests/Rules/RequiredTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Required;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/TypeArrayTest.php b/tests/Rules/TypeArrayTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\TypeArray;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/UploadedFileTest.php b/tests/Rules/UploadedFileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\UploadedFile;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/UppercaseTest.php b/tests/Rules/UppercaseTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Uppercase;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/Rules/UrlTest.php b/tests/Rules/UrlTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace IgniteKit\Validation\Tests;
+namespace IgniteKit\Validation\Tests\Rules;
 
 use IgniteKit\Validation\Rules\Url;
 use PHPUnit\Framework\TestCase;
diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
@@ -5,10 +5,12 @@
 use DateTime;
 use IgniteKit\Validation\RuleNotFoundException;
 use IgniteKit\Validation\RuleQuashException;
-use PHPUnit\Framework\TestCase;
-use IgniteKit\Validation\Rule;
-use IgniteKit\Validation\Rules\UploadedFile;
+use IgniteKit\Validation\Tests\Fixtures\Required;
 use IgniteKit\Validation\Validator;
+use IgniteKit\Validation\Rules\UploadedFile;
+use IgniteKit\Validation\Tests\Fixtures\Even;
+
+use PHPUnit\Framework\TestCase;
 
 class ValidatorTest extends TestCase
 {
@@ -1298,7 +1300,7 @@ public function testGetValidData()
         ], $validData);
 
         $stuffs = $validData['stuffs'];
-        $this->assertFalse(isset($stuffs['three']));
+        $this->assertArrayNotHasKey('three', $stuffs);
     }
 
     public function testGetInvalidData()
@@ -1351,8 +1353,8 @@ public function testGetInvalidData()
         ], $invalidData);
 
         $stuffs = $invalidData['stuffs'];
-        $this->assertFalse(isset($stuffs['one']));
-        $this->assertFalse(isset($stuffs['two']));
+        $this->assertArrayNotHasKey('one', $stuffs);
+        $this->assertArrayNotHasKey('two', $stuffs);
     }
 
     public function testRuleInInvalidMessages()
