Skip to content

Commit 98edf7f

Browse files
Merge pull request #14 from 21TORR/bump-phpunit
Bump PHPUnit [req #13]
2 parents b4ccdc5 + d913175 commit 98edf7f

8 files changed

Lines changed: 58 additions & 39 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/.editorconfig
22
/.php-cs-fixer.cache
3-
/.phpunit.result.cache
3+
/.phpunit.cache
44
/composer.lock
55
/vendor
66
/vendor-bin/*/composer.lock

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"bamarni/composer-bin-plugin": "^1.8",
2222
"doctrine/common": "^3.5",
2323
"roave/security-advisories": "dev-latest",
24-
"symfony/phpunit-bridge": "^7.2"
24+
"phpunit/phpunit": "^12.2.5"
2525
},
2626
"autoload": {
2727
"psr-4": {
@@ -55,7 +55,7 @@
5555
"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"
5656
],
5757
"test": [
58-
"simple-phpunit",
58+
"phpunit",
5959
"vendor-bin/phpstan/vendor/bin/phpstan analyze -c phpstan.neon . --ansi -v"
6060
]
6161
}

phpstan.neon

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,2 @@
11
includes:
22
- vendor/21torr/janus/phpstan/lib.neon
3-
4-
# If you use simple-phpunit, you need to uncomment the following line.
5-
# Always make sure to first run simple-phpunit and then PHPStan.
6-
parameters:
7-
bootstrapFiles:
8-
- vendor/bin/.phpunit/phpunit/vendor/autoload.php

phpunit.dist.xml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
5+
colors="true"
6+
failOnNotice="true"
7+
failOnWarning="true"
8+
cacheDirectory=".phpunit.cache"
9+
displayDetailsOnPhpunitDeprecations="true"
10+
displayDetailsOnTestsThatTriggerDeprecations="true"
11+
>
12+
<php>
13+
<ini name="display_errors" value="1" />
14+
<ini name="error_reporting" value="-1" />
15+
<server name="APP_ENV" value="test" force="true" />
16+
<server name="SHELL_VERBOSITY" value="-1" />
17+
</php>
18+
19+
<testsuites>
20+
<testsuite name="Bundle Test Suite">
21+
<directory>tests</directory>
22+
</testsuite>
23+
</testsuites>
24+
25+
<source
26+
ignoreSuppressionOfDeprecations="true"
27+
ignoreIndirectDeprecations="true"
28+
restrictNotices="true"
29+
restrictWarnings="true"
30+
>
31+
<include>
32+
<directory>src</directory>
33+
</include>
34+
35+
<deprecationTrigger>
36+
<function>trigger_deprecation</function>
37+
</deprecationTrigger>
38+
</source>
39+
40+
<extensions>
41+
</extensions>
42+
</phpunit>

phpunit.xml

Lines changed: 0 additions & 25 deletions
This file was deleted.

tests/Normalizer/ArrayNormalizerTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Tests\Torr\SimpleNormalizer\Normalizer;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use PHPUnit\Framework\TestCase;
67
use Torr\SimpleNormalizer\Test\SimpleNormalizerTestTrait;
78

@@ -24,8 +25,9 @@ public static function provideListArray () : iterable
2425
}
2526

2627
/**
27-
* @dataProvider provideListArray
28+
*
2829
*/
30+
#[DataProvider("provideListArray")]
2931
public function testListArray (array $input, array $expected) : void
3032
{
3133
$normalizer = $this->createNormalizer();
@@ -46,8 +48,9 @@ public static function provideAssociativeArray () : iterable
4648
}
4749

4850
/**
49-
* @dataProvider provideAssociativeArray
51+
*
5052
*/
53+
#[DataProvider("provideAssociativeArray")]
5154
public function testAssociativeArray (array $input, array $expected) : void
5255
{
5356
$normalizer = $this->createNormalizer();

tests/Normalizer/BasicTypesNormalizerTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Tests\Torr\SimpleNormalizer\Normalizer;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use PHPUnit\Framework\TestCase;
67
use Torr\SimpleNormalizer\Exception\UnsupportedTypeException;
78
use Torr\SimpleNormalizer\Test\SimpleNormalizerTestTrait;
@@ -26,8 +27,9 @@ public static function provideBasicValue () : iterable
2627
}
2728

2829
/**
29-
* @dataProvider provideBasicValue
30+
*
3031
*/
32+
#[DataProvider("provideBasicValue")]
3133
public function testBasicValue (mixed $input, mixed $expected) : void
3234
{
3335
$normalizer = $this->createNormalizer();
@@ -43,8 +45,9 @@ public static function provideInvalidValue () : iterable
4345
}
4446

4547
/**
46-
* @dataProvider provideInvalidValue
48+
*
4749
*/
50+
#[DataProvider("provideInvalidValue")]
4851
public function testInvalidValue (mixed $input) : void
4952
{
5053
$this->expectException(UnsupportedTypeException::class);

tests/Normalizer/SimpleNormalizerTest.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Tests\Torr\SimpleNormalizer\Normalizer;
44

5+
use PHPUnit\Framework\Attributes\DataProvider;
56
use Symfony\Component\DependencyInjection\ServiceLocator;
67
use Tests\Torr\SimpleNormalizer\Fixture\DummyVO;
78
use Torr\SimpleNormalizer\Exception\IncompleteNormalizationException;
@@ -31,8 +32,9 @@ public static function provideJsonVerifierEnabled () : iterable
3132
}
3233

3334
/**
34-
* @dataProvider provideJsonVerifierEnabled
35+
*
3536
*/
37+
#[DataProvider('provideJsonVerifierEnabled')]
3638
public function testJsonVerifierEnabled (callable $call) : void
3739
{
3840
$verifier = $this->createMock(ValidJsonVerifier::class);

0 commit comments

Comments
 (0)