Merge pull request #163 from greg0ire/3.1.x

Merge 3.1.x up into 4.0.x

Author: greg0ire

composer.json

@@ -30,8 +30,8 @@
     },
     "require-dev": {
         "doctrine/coding-standard": "^14",
-        "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^10.5.58"
+        "phpstan/phpstan": "^2",
+        "phpunit/phpunit": "^10.5.58 || ^12.5.4"
     },
     "autoload": {
         "psr-4": {

phpstan.neon.dist

@@ -3,8 +3,3 @@ parameters:
   paths:
     - %rootDir%/../../../src
     - %rootDir%/../../../tests
-
-  ignoreErrors:
-    -
-      message: '#^Method Doctrine\\Tests\\Common\\Lexer\\AbstractLexerTest\:\:dataProvider\(\) should return array\<int, array\{string, array\<int, Doctrine\\Common\\Lexer\\Token\<string, int\|string\>\>\}\> but returns array\{array\{''price\=10'', array\{Doctrine\\Common\\Lexer\\Token\<string, string\>, Doctrine\\Common\\Lexer\\Token\<string, string\>, Doctrine\\Common\\Lexer\\Token\<string, int\>\}\}\}\.$#'
-      path: tests/AbstractLexerTest.php

phpunit.xml.dist

@@ -2,7 +2,7 @@
 
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"

src/Token.php

@@ -10,7 +10,7 @@
 
 /**
  * @template T of UnitEnum|string|int
- * @template V of string|int|float|bool
+ * @template-covariant V of string|int|float|bool
  */
 final readonly class Token
 {