Merge pull request #11 from POPSuL/multiversion

Implemented support for all of php versions between 7.4 and 8.3
franzose · Apr 23, 2024 · 9a8dc57 · 9a8dc57
2 parents 21a355f + 38513d5
commit 9a8dc57
Show file tree

Hide file tree

Showing 10 changed files with 829 additions and 554 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     }
   ],
   "require-dev": {
-    "phpunit/phpunit": "~6.0"
+    "phpunit/phpunit": "^9.3.0"
   },
   "autoload": {
     "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Error/Errors.php b/src/Error/Errors.php
@@ -54,6 +54,7 @@ public function has($attribute)
         return array_key_exists($attribute, $this->errors);
     }
 
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return count($this->errors);

diff --git a/src/Rules/Core/DateTime.php b/src/Rules/Core/DateTime.php
@@ -33,6 +33,10 @@ public function isValid($input = null)
         PhpDateTime::createFromFormat(static::FORMAT, $input);
         $errors = PhpDateTime::getLastErrors();
 
+        if ($errors === false) {
+            return true;
+        }
+
         if ($errors['error_count'] > 0) {
             $this->violations[] = 'format';
 

diff --git a/tests/Rules/CallableRuleWrapperTest.php b/tests/Rules/CallableRuleWrapperTest.php
@@ -7,11 +7,9 @@
 
 class CallableRuleWrapperTest extends TestCase
 {
-    /**
-     * @expectedException \UnexpectedValueException
-     */
     public function testConstructorThrowsOnValidationAbsence()
     {
+        $this->expectException(\UnexpectedValueException::class);
         new CallableRuleWrapper(['name' => 'foo']);
     }
 

diff --git a/tests/Rules/Core/EmailTest.php b/tests/Rules/Core/EmailTest.php
@@ -21,6 +21,6 @@ public function testMxAndHostValidation()
 
         static::assertFalse($valid);
         static::assertCount(2, $violations);
-        static::assertArraySubset(['mx', 'host'], $violations);
+        static::assertEquals(['mx', 'host'], $violations);
     }
 }
diff --git a/tests/Rules/Core/LengthTest.php b/tests/Rules/Core/LengthTest.php
@@ -7,19 +7,15 @@
 
 class LengthTest extends TestCase
 {
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testThrowsWhenMinAndMaxAreNull()
     {
+        $this->expectException(\InvalidArgumentException::class);
         new Length;
     }
 
-    /**
-     * @expectedException \LogicException
-     */
     public function testThrowsWhenMaxIsLessThanMin()
     {
+        $this->expectException(\LogicException::class);
         new Length(5, 0);
     }
 

diff --git a/tests/Rules/Core/RangeTest.php b/tests/Rules/Core/RangeTest.php
@@ -8,19 +8,15 @@
 
 class RangeTest extends TestCase
 {
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testThrowsWhenMinAndMaxAreNull()
     {
+        $this->expectException(\InvalidArgumentException::class);
         new Range;
     }
 
-    /**
-     * @expectedException \LogicException
-     */
     public function testThrowsWhenMaxIsLessThanMin()
     {
+        $this->expectException(\LogicException::class);
         new Range(5, 0);
     }
 

diff --git a/tests/Rules/Core/RegexTest.php b/tests/Rules/Core/RegexTest.php
@@ -7,11 +7,9 @@
 
 class RegexTest extends TestCase
 {
-    /**
-     * @expectedException \InvalidArgumentException
-     */
     public function testShouldOnlyAcceptPatternAsString()
     {
+        $this->expectException(\InvalidArgumentException::class);
         new Regex(234);
     }
 

diff --git a/tests/ValidatorTest.php b/tests/ValidatorTest.php
@@ -50,11 +50,9 @@ public function testConstructor()
         static::assertEquals($messages, $validator->getMessages());
     }
 
-    /**
-     * @expectedException \UnexpectedValueException
-     */
     public function testThrowsOnUnknownRule()
     {
+        $this->expectException(\UnexpectedValueException::class);
         $this->validate(['foo' => 'bar'], ['foo' => 'uknown_rule'], ['foo' => 'error!']);
     }