Using PHPUnit 10

Author: nyamsprod

.gitignore

@@ -4,7 +4,7 @@ docs
 build
 pdp
 .idea
+.phpunit.cache
 .php_cs.cache
 .php-cs-fixer.cache
-.phpunit.result.cache
 composer.lock

composer.json

@@ -49,10 +49,10 @@
         "friendsofphp/php-cs-fixer": "^v3.13.2",
         "guzzlehttp/guzzle": "^7.5",
         "guzzlehttp/psr7": "^1.6 || ^2.4.3",
-        "phpstan/phpstan": "^1.9.6",
-        "phpstan/phpstan-phpunit": "^1.3.3",
-        "phpstan/phpstan-strict-rules": "^1.4.4",
-        "phpunit/phpunit": "^9.5.27",
+        "phpstan/phpstan": "^1.9.17",
+        "phpstan/phpstan-phpunit": "^1.3.4",
+        "phpstan/phpstan-strict-rules": "^1.4.5",
+        "phpunit/phpunit": "^10.0.7",
         "psr/http-factory": "^1.0.1",
         "psr/simple-cache": "^1.0.1",
         "symfony/cache": "^v5.0.0 || ^v6.0.0"

phpunit.xml.dist

@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+  xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
   bootstrap="vendor/autoload.php"
   backupGlobals="false"
-  backupStaticAttributes="false"
   colors="true"
-  verbose="true"
-  convertErrorsToExceptions="true"
-  convertNoticesToExceptions="true"
-  convertWarningsToExceptions="true"
   processIsolation="false"
-  stopOnFailure="false">
+  stopOnFailure="false"
+  cacheDirectory=".phpunit.cache"
+  backupStaticProperties="false"
+>
   <coverage>
     <include>
       <directory suffix=".php">src</directory>

src/DomainTest.php

@@ -4,19 +4,14 @@
 
 namespace Pdp;
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 use TypeError;
 
-/**
- * @coversDefaultClass \Pdp\Domain
- */
 final class DomainTest extends TestCase
 {
-    /**
-     * @covers \Pdp\SyntaxError
-     * @dataProvider invalidDomainProvider
-     */
+    #[DataProvider('invalidDomainProvider')]
     public function testToAsciiThrowsException(string $domain): void
     {
         $this->expectException(SyntaxError::class);
@@ -27,7 +22,7 @@ public function testToAsciiThrowsException(string $domain): void
     /**
      * @return iterable<string,array{0:string}>
      */
-    public function invalidDomainProvider(): iterable
+    public static function invalidDomainProvider(): iterable
     {
         return [
             'invalid IDN domain' => ['a⒈com'],
@@ -56,10 +51,9 @@ public function testDomainInternalPhpMethod(): void
     }
 
     /**
-     * @dataProvider countableProvider
-     *
-     * @param string[] $labels
+     * @param array<string> $labels
      */
+    #[DataProvider('countableProvider')]
     public function testCountable(?string $domain, int $nbLabels, array $labels): void
     {
         $domain = Domain::fromIDNA2008($domain);
@@ -70,7 +64,7 @@ public function testCountable(?string $domain, int $nbLabels, array $labels): vo
     /**
      * @return iterable<string,array{0:string|null, 1:int, 2:array<string>}>
      */
-    public function countableProvider(): iterable
+    public static function countableProvider(): iterable
     {
         return [
             'null' => [null, 0, []],
@@ -112,9 +106,7 @@ public function testLabels(): void
         self::assertSame([], Domain::fromIDNA2008(null)->labels());
     }
 
-    /**
-     * @dataProvider toUnicodeProvider
-     */
+    #[DataProvider('toUnicodeProvider')]
     public function testToIDN(
         ?string $domain,
         ?string $expectedDomain,
@@ -131,7 +123,7 @@ public function testToIDN(
     /**
      * @return iterable<string,array{domain:string|null, expectedDomain:string|null, expectedIDNDomain:string|null}>
      */
-    public function toUnicodeProvider(): iterable
+    public static function toUnicodeProvider(): iterable
     {
         return [
             'simple domain' => [
@@ -172,9 +164,7 @@ public function toUnicodeProvider(): iterable
         ];
     }
 
-    /**
-     * @dataProvider toAsciiProvider
-     */
+    #[DataProvider('toAsciiProvider')]
     public function testToAscii(
         ?string $domain,
         ?string $expectedDomain,
@@ -191,7 +181,7 @@ public function testToAscii(
     /**
      * @return iterable<string,array{domain:string|null, expectedDomain:string|null, expectedIDNDomain:string|null}>
      */
-    public function toAsciiProvider(): iterable
+    public static function toAsciiProvider(): iterable
     {
         return [
             'simple domain' => [
@@ -222,9 +212,7 @@ public function toAsciiProvider(): iterable
         ];
     }
 
-    /**
-     * @dataProvider withLabelWorksProvider
-     */
+    #[DataProvider('withLabelWorksProvider')]
     public function testWithLabelWorks(DomainName $domain, int $key, string $label, ?string $expected): void
     {
         $result = $domain->withLabel($key, $label);
@@ -234,7 +222,7 @@ public function testWithLabelWorks(DomainName $domain, int $key, string $label,
     /**
      * @return iterable<string,array{domain:DomainName, key:int, label:string, expected:string}>
      */
-    public function withLabelWorksProvider(): iterable
+    public static function withLabelWorksProvider(): iterable
     {
         $base_domain = Domain::fromIDNA2008('www.example.com');
 
@@ -321,9 +309,7 @@ public function testWithLabelFailsWithInvalidLabel2(): void
         Domain::fromIDNA2008('example.com')->withLabel(-1, '');
     }
 
-    /**
-     * @dataProvider validAppend
-     */
+    #[DataProvider('validAppend')]
     public function testAppend(string $raw, string $append, string $expected): void
     {
         self::assertSame($expected, Domain::fromIDNA2008($raw)->append($append)->toString());
@@ -332,7 +318,7 @@ public function testAppend(string $raw, string $append, string $expected): void
     /**
      * @return iterable<array-key, array{0:string, 1:string, 2:string}>
      */
-    public function validAppend(): iterable
+    public static function validAppend(): iterable
     {
         return [
             ['secure.example.com', '8.8.8.8', 'secure.example.com.8.8.8.8'],
@@ -342,9 +328,7 @@ public function validAppend(): iterable
         ];
     }
 
-    /**
-     * @dataProvider validPrepend
-     */
+    #[DataProvider('validPrepend')]
     public function testPrepend(string $raw, string $prepend, string $expected): void
     {
         self::assertSame($expected, Domain::fromIDNA2008($raw)->prepend($prepend)->toString());
@@ -353,7 +337,7 @@ public function testPrepend(string $raw, string $prepend, string $expected): voi
     /**
      * @return iterable<array-key, array{0:string, 1:string, 2:string}>
      */
-    public function validPrepend(): iterable
+    public static function validPrepend(): iterable
     {
         return [
             ['secure.example.com', 'master', 'master.secure.example.com'],
@@ -362,9 +346,7 @@ public function validPrepend(): iterable
         ];
     }
 
-    /**
-     * @dataProvider withoutLabelWorksProvider
-     */
+    #[DataProvider('withoutLabelWorksProvider')]
     public function testwithoutLabelWorks(DomainName $domain, int $key, ?string $expected): void
     {
         $result = $domain->withoutLabel($key);
@@ -374,7 +356,7 @@ public function testwithoutLabelWorks(DomainName $domain, int $key, ?string $exp
     /**
      * @return iterable<string,array{domain:DomainName, key:int, expected:string}>
      */
-    public function withoutLabelWorksProvider(): iterable
+    public static function withoutLabelWorksProvider(): iterable
     {
         $base_domain = Domain::fromIDNA2008('www.example.com');
 
@@ -413,9 +395,7 @@ public function testwithoutLabelWorksWithMultipleKeys(): void
         self::assertNull(Domain::fromIDNA2008('www.example.com')->withoutLabel(0, 1, 2)->value());
     }
 
-    /**
-     * @dataProvider resolveCustomIDNAOptionsProvider
-     */
+    #[DataProvider('resolveCustomIDNAOptionsProvider')]
     public function testResolveWorksWithCustomIDNAOptions(
         string $domainName,
         string $withLabel,
@@ -434,7 +414,7 @@ public function testResolveWorksWithCustomIDNAOptions(
     /**
      * @return iterable<string,array<string>>
      */
-    public function resolveCustomIDNAOptionsProvider(): iterable
+    public static function resolveCustomIDNAOptionsProvider(): iterable
     {
         return [
             'without deviation characters' => [