Merge pull request #14 from franzose/fix/tests

fix: fix broken tests

Author: franzose

.github/workflows/ci.yaml

@@ -2,8 +2,7 @@ name: 'Continuous Integration'
 
 on:
   pull_request: ~
-  push:
-    branches: [ 2.x ]
+  push: ~
 
 jobs:
   unit-tests:

tests/Data/DataTest.php

@@ -5,6 +5,7 @@
 
 use Kontrolio\Data\Attribute;
 use Kontrolio\Data\Data;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 final class DataTest extends TestCase
@@ -15,6 +16,7 @@ final class DataTest extends TestCase
      * @param string|null $name
      * @param Attribute $expectedAttribute
      */
+    #[DataProvider('getTestsDataProvider')]
     public function testGet(array $data, ?string $name, Attribute $expectedAttribute): void
     {
         $data = new Data($data);
@@ -24,7 +26,7 @@ public function testGet(array $data, ?string $name, Attribute $expectedAttribute
         static::assertEquals($expectedAttribute, $attribute);
     }
 
-    public function getTestsDataProvider(): array
+    public static function getTestsDataProvider(): array
     {
         return [
             [['foo' => 'bar'], null, new Attribute(null)],

tests/Rules/Core/IsFalseTest.php

@@ -3,18 +3,18 @@
 
 namespace Kontrolio\Tests\Rules\Core;
 
-use Kontrolio\Rules\Core\IsTrue;
+use Kontrolio\Rules\Core\IsFalse;
 use PHPUnit\Framework\TestCase;
 
-class IsTrueTest extends TestCase
+class IsFalseTest extends TestCase
 {
     public function testValidation(): void
     {
-        $rule = new IsTrue;
-        
+        $rule = new IsFalse;
+
         static::assertFalse($rule->isValid('foo'));
         static::assertFalse($rule->isValid(''));
         static::assertFalse($rule->isValid());
-        static::assertTrue($rule->isValid(true));
+        static::assertTrue($rule->isValid(false));
     }
 }

tests/Rules/Core/IsInTest.php

@@ -4,6 +4,7 @@
 namespace Kontrolio\Tests\Rules\Core;
 
 use Kontrolio\Rules\Core\IsIn;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -21,6 +22,7 @@ class IsInTest extends TestCase
      * @param bool $expectedResult
      * @dataProvider dpValidation
      */
+    #[DataProvider('dpValidation')]
     public function testValidation(array $haystack, bool $strict, string $input, bool $expectedResult): void
     {
         $rule = new IsIn($haystack, $strict);
@@ -31,7 +33,7 @@ public function testValidation(array $haystack, bool $strict, string $input, boo
         );
     }
 
-    public function dpValidation(): array
+    public static function dpValidation(): array
     {
         return [
             [

tests/Rules/Core/IsTrueTest.php

@@ -3,18 +3,18 @@
 
 namespace Kontrolio\Tests\Rules\Core;
 
-use Kontrolio\Rules\Core\IsFalse;
+use Kontrolio\Rules\Core\IsTrue;
 use PHPUnit\Framework\TestCase;
 
-class IsFalseTest extends TestCase
+class IsTrueTest extends TestCase
 {
     public function testValidation(): void
     {
-        $rule = new IsFalse;
+        $rule = new IsTrue;
 
         static::assertFalse($rule->isValid('foo'));
         static::assertFalse($rule->isValid(''));
         static::assertFalse($rule->isValid());
-        static::assertTrue($rule->isValid(false));
+        static::assertTrue($rule->isValid(true));
     }
 }

tests/Rules/InstantiatorTest.php

@@ -8,6 +8,7 @@
 use Kontrolio\Rules\Instantiator;
 use Kontrolio\Rules\RuleInterface;
 use Kontrolio\Validator;
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use ReflectionException;
 use UnexpectedValueException;
@@ -21,6 +22,7 @@ final class InstantiatorTest extends TestCase
      *
      * @throws ReflectionException
      */
+    #[DataProvider('exceptionDataProvider')]
     public function testThrowsIfClassIsNotInstantiable(string $class, string $message): void
     {
         $this->expectException(UnexpectedValueException::class);
@@ -29,7 +31,7 @@ public function testThrowsIfClassIsNotInstantiable(string $class, string $messag
         (new Instantiator())->make($class);
     }
 
-    public function exceptionDataProvider(): array
+    public static function exceptionDataProvider(): array
     {
         return [
             [AbstractRule::class, 'Rule class must be instantiable.'],