Bump PHPUnit (#71)

* Bump PHPUnit

* wip

Author: kubk

.gitignore

@@ -5,3 +5,4 @@ vendor
 .phpunit.result.cache
 composer.lock
 node_modules
+.phpunit.cache

composer.json

@@ -8,10 +8,9 @@
         }
     ],
     "scripts": {
-        "test:e2e": "vendor/bin/phpunit tests",
-        "test:unit": "vendor/bin/phpunit src",
-        "test": ["@test:unit", "@test:e2e"],
-        "test:update-snapshots": "vendor/bin/phpunit tests -d --update-snapshots",
+        "test": "XDEBUG_MODE=coverage vendor/bin/phpunit",
+        "test:no-coverage": "vendor/bin/phpunit",
+        "test:update-snapshots": "vendor/bin/phpunit -d --update-snapshots",
         "cs:src": "vendor/bin/php-cs-fixer fix src",
         "cs:tests": "vendor/bin/php-cs-fixer fix tests",
         "cs": ["@cs:src", "@cs:tests"],
@@ -44,8 +43,8 @@
         "bin/php-converter-ts"
     ],
     "require-dev": {
-        "phpunit/phpunit": "^9",
-        "spatie/phpunit-snapshot-assertions": "4.2.8",
+        "phpunit/phpunit": "^10",
+        "spatie/phpunit-snapshot-assertions": "^5",
         "myclabs/php-enum": "^1.8",
         "friendsofphp/php-cs-fixer": "^3.0",
         "symfony/var-dumper": "^5.3|^6.0",

phpunit.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.2/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" beStrictAboutOutputDuringTests="true" failOnRisky="true" failOnWarning="true" cacheDirectory=".phpunit.cache" beStrictAboutCoverageMetadata="true">
+  <testsuites>
+    <testsuite name="default">
+      <directory>tests</directory>
+      <directory>src</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <text outputFile="php://stdout" showUncoveredFiles="true"/>
+    </report>
+  </coverage>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
+</phpunit>

src/Ast/PhpDocTypeParser.php

@@ -35,7 +35,8 @@ public function __construct()
 
     public function parse(string $input): PhpTypeInterface|null
     {
-        $result = $this->phpDocParser->parse(new TokenIterator($this->lexer->tokenize($input)))->children;
+        $tokens = new TokenIterator($this->lexer->tokenize($input));
+        $result = $this->phpDocParser->parse($tokens)->children;
         if (!is_array($result)) {
             return null;
         }

src/Ast/PhpDocTypeParserTest.php

@@ -4,6 +4,7 @@
 
 namespace Riverwaysoft\PhpConverter\Ast;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Riverwaysoft\PhpConverter\Dto\PhpType\PhpBaseType;
 use Riverwaysoft\PhpConverter\Dto\PhpType\PhpListType;
@@ -14,7 +15,7 @@
 
 class PhpDocTypeParserTest extends TestCase
 {
-    /** @dataProvider getData */
+    #[DataProvider('getData')]
     public function testBasicScenario(string $explanation, string $input, PhpTypeInterface|null $expected): void
     {
         $parser = new PhpDocTypeParser();
@@ -23,7 +24,7 @@ public function testBasicScenario(string $explanation, string $input, PhpTypeInt
     }
 
     /** @return array{string, string, PhpTypeInterface|null}[] */
-    public function getData(): array
+    public static function getData(): array
     {
         return [
             [

src/Dto/DtoTypeTest.php

@@ -2,25 +2,26 @@
 
 namespace Riverwaysoft\PhpConverter\Dto;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Riverwaysoft\PhpConverter\Dto\PhpType\PhpBaseType;
 
 class DtoTypeTest extends TestCase
 {
-    /** @dataProvider provideEmptyDto */
+    #[DataProvider('provideEmptyDto')]
     public function testIsEmpty(DtoType $dto, bool $isEmptyExpected): void
     {
         $this->assertEquals($isEmptyExpected, $dto->isEmpty());
     }
 
-    /** @dataProvider provideStringEnumDto */
+    #[DataProvider('provideStringEnumDto')]
     public function testIsStringEnum(DtoType $dto, bool $isStringExpected): void
     {
         $this->assertEquals($isStringExpected, $dto->isStringEnum());
     }
 
     /** @return \Generator<array{0: DtoType, 1: bool}> */
-    public function provideEmptyDto(): iterable
+    public static function provideEmptyDto(): iterable
     {
         yield [new DtoType(
             name: 'User',
@@ -53,7 +54,7 @@ public function provideEmptyDto(): iterable
     }
 
     /** @return \Generator<array{0: DtoType, 1: bool}> */
-    public function provideStringEnumDto(): iterable
+    public static function provideStringEnumDto(): iterable
     {
         yield [new DtoType(
             name: 'RoleEnum',

src/Language/Dart/DartEnumValidatorTest.php

@@ -2,6 +2,7 @@
 
 namespace Riverwaysoft\PhpConverter\Language\Dart;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Riverwaysoft\PhpConverter\Dto\DtoEnumProperty;
 use Riverwaysoft\PhpConverter\Dto\DtoType;
@@ -36,7 +37,7 @@ public function testValidationForDart(): void
         $this->expectNotToPerformAssertions();
     }
 
-    /** @dataProvider provideInvalidData */
+    #[DataProvider('provideInvalidData')]
     public function testInvalidEnumForDart(DtoType $enumInvalid, string $message): void
     {
         if (PHP_VERSION_ID < 80100) {
@@ -50,7 +51,7 @@ public function testInvalidEnumForDart(DtoType $enumInvalid, string $message): v
         $dartEnumValidator->assertIsValidEnumForDart($enumInvalid);
     }
 
-    public function provideInvalidData(): \Generator
+    public static function provideInvalidData(): \Generator
     {
         yield [
             new DtoType(

tests/ConverterTest.php

@@ -4,6 +4,7 @@
 
 namespace App\Tests;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use Riverwaysoft\PhpConverter\Ast\Converter;
 use Riverwaysoft\PhpConverter\Ast\DtoVisitor;
@@ -273,7 +274,7 @@ public function getUserMethodsString() {}
         $this->assertMatchesJsonSnapshot(json_encode($result->apiEndpointList));
     }
 
-    /** @dataProvider provideInvalidControllers */
+    #[DataProvider('provideInvalidControllers')]
     public function testTheFollowingCodeShouldThrow(string $invalidControllerActionCode, string $expectedError): void
     {
         $codeWithDateTime = <<<'CODE'
@@ -325,7 +326,7 @@ class SomeController {
         $converter->convert([$codeWithDateTime]);
     }
 
-    public function provideInvalidControllers(): \Generator
+    public static function provideInvalidControllers(): \Generator
     {
         yield [
             <<<'CODE'