diff --git a/.gitignore b/.gitignore
index b7c0b54..f523218 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
/.editorconfig
/.php-cs-fixer.cache
-/.phpunit.result.cache
+/.phpunit.cache
/composer.lock
/vendor
/vendor-bin/*/composer.lock
diff --git a/composer.json b/composer.json
index ac86d18..5b6ef78 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
"bamarni/composer-bin-plugin": "^1.8",
"doctrine/common": "^3.5",
"roave/security-advisories": "dev-latest",
- "symfony/phpunit-bridge": "^7.2"
+ "phpunit/phpunit": "^12.2.5"
},
"autoload": {
"psr-4": {
@@ -55,7 +55,7 @@
"vendor-bin/cs-fixer/vendor/bin/php-cs-fixer check --diff --config vendor-bin/cs-fixer/vendor/21torr/php-cs-fixer/.php-cs-fixer.dist.php --no-interaction --ansi"
],
"test": [
- "simple-phpunit",
+ "phpunit",
"vendor-bin/phpstan/vendor/bin/phpstan analyze -c phpstan.neon . --ansi -v"
]
}
diff --git a/phpstan.neon b/phpstan.neon
index c97c69f..2300f7d 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -1,8 +1,2 @@
includes:
- vendor/21torr/janus/phpstan/lib.neon
-
-# If you use simple-phpunit, you need to uncomment the following line.
-# Always make sure to first run simple-phpunit and then PHPStan.
-parameters:
- bootstrapFiles:
- - vendor/bin/.phpunit/phpunit/vendor/autoload.php
diff --git a/phpunit.dist.xml b/phpunit.dist.xml
new file mode 100644
index 0000000..43123c0
--- /dev/null
+++ b/phpunit.dist.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ tests
+
+
+
+
+
+ src
+
+
+
+ trigger_deprecation
+
+
+
+
+
+
diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index 829d78d..0000000
--- a/phpunit.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- tests
- tests/fixtures
-
-
-
-
-
-
-
diff --git a/tests/Normalizer/ArrayNormalizerTest.php b/tests/Normalizer/ArrayNormalizerTest.php
index 3908473..e51b58d 100644
--- a/tests/Normalizer/ArrayNormalizerTest.php
+++ b/tests/Normalizer/ArrayNormalizerTest.php
@@ -2,6 +2,7 @@
namespace Tests\Torr\SimpleNormalizer\Normalizer;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
use Torr\SimpleNormalizer\Test\SimpleNormalizerTestTrait;
@@ -24,8 +25,9 @@ public static function provideListArray () : iterable
}
/**
- * @dataProvider provideListArray
+ *
*/
+ #[DataProvider("provideListArray")]
public function testListArray (array $input, array $expected) : void
{
$normalizer = $this->createNormalizer();
@@ -46,8 +48,9 @@ public static function provideAssociativeArray () : iterable
}
/**
- * @dataProvider provideAssociativeArray
+ *
*/
+ #[DataProvider("provideAssociativeArray")]
public function testAssociativeArray (array $input, array $expected) : void
{
$normalizer = $this->createNormalizer();
diff --git a/tests/Normalizer/BasicTypesNormalizerTest.php b/tests/Normalizer/BasicTypesNormalizerTest.php
index 1a4ba93..738ce1b 100644
--- a/tests/Normalizer/BasicTypesNormalizerTest.php
+++ b/tests/Normalizer/BasicTypesNormalizerTest.php
@@ -2,6 +2,7 @@
namespace Tests\Torr\SimpleNormalizer\Normalizer;
+use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
use Torr\SimpleNormalizer\Exception\UnsupportedTypeException;
use Torr\SimpleNormalizer\Test\SimpleNormalizerTestTrait;
@@ -26,8 +27,9 @@ public static function provideBasicValue () : iterable
}
/**
- * @dataProvider provideBasicValue
+ *
*/
+ #[DataProvider("provideBasicValue")]
public function testBasicValue (mixed $input, mixed $expected) : void
{
$normalizer = $this->createNormalizer();
@@ -43,8 +45,9 @@ public static function provideInvalidValue () : iterable
}
/**
- * @dataProvider provideInvalidValue
+ *
*/
+ #[DataProvider("provideInvalidValue")]
public function testInvalidValue (mixed $input) : void
{
$this->expectException(UnsupportedTypeException::class);
diff --git a/tests/Normalizer/SimpleNormalizerTest.php b/tests/Normalizer/SimpleNormalizerTest.php
index bc35564..3ee28cf 100644
--- a/tests/Normalizer/SimpleNormalizerTest.php
+++ b/tests/Normalizer/SimpleNormalizerTest.php
@@ -2,6 +2,7 @@
namespace Tests\Torr\SimpleNormalizer\Normalizer;
+use PHPUnit\Framework\Attributes\DataProvider;
use Symfony\Component\DependencyInjection\ServiceLocator;
use Tests\Torr\SimpleNormalizer\Fixture\DummyVO;
use Torr\SimpleNormalizer\Exception\IncompleteNormalizationException;
@@ -31,8 +32,9 @@ public static function provideJsonVerifierEnabled () : iterable
}
/**
- * @dataProvider provideJsonVerifierEnabled
+ *
*/
+ #[DataProvider('provideJsonVerifierEnabled')]
public function testJsonVerifierEnabled (callable $call) : void
{
$verifier = $this->createMock(ValidJsonVerifier::class);