Update phpstan and phpunit

composer.json

@@ -27,16 +27,16 @@
         "php": ">=8.1"
     },
     "require-dev": {
-        "digitalrevolution/accessorpair-constraint": "^2.1.18",
-        "digitalrevolution/phpunit-file-coverage-inspection": "^2.1",
+        "digitalrevolution/accessorpair-constraint": "^2.5",
+        "digitalrevolution/phpunit-file-coverage-inspection": "^2.2",
         "roave/security-advisories": "dev-latest",
-        "squizlabs/php_codesniffer": "^3.8",
+        "squizlabs/php_codesniffer": "^3.11",
         "phpmd/phpmd": "^2.15",
-        "phpunit/phpunit": "^10.5",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-phpunit": "^1.3",
-        "phpstan/phpstan-strict-rules": "^1.5",
-        "phpstan/extension-installer": "^1.3"
+        "phpunit/phpunit": "^10.5 || ^11.5",
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/phpstan-strict-rules": "^2.0",
+        "phpstan/extension-installer": "^1.4"
     },
     "scripts": {
         "check": ["@check:phpstan", "@check:phpmd", "@check:phpcs"],

src/Diff/ByWordRt.php

@@ -81,7 +81,7 @@ public static function compareAndSplit(CharSequence $text1, CharSequence $text2,
     }
 
     /**
-     * @return InlineChunk[]
+     * @return list<InlineChunk>
      */
     public static function getInlineChunks(CharSequence $text): array
     {

src/Diff/Comparison/AbstractChunkOptimizer.php

@@ -10,6 +10,7 @@
 use DR\JBDiff\Entity\Range;
 use DR\JBDiff\Entity\Side;
 use DR\JBDiff\Util\TrimUtil;
+
 use function count;
 
 /**
@@ -21,8 +22,8 @@ abstract class AbstractChunkOptimizer
     private array $ranges = [];
 
     /**
-     * @param T[]                       $data1
-     * @param T[]                       $data2
+     * @param list<T>                   $data1
+     * @param list<T>                   $data2
      * @param FairDiffIterableInterface $iterable
      */
     public function __construct(

src/Diff/Comparison/WordChunkOptimizer.php

@@ -26,8 +26,8 @@
 class WordChunkOptimizer extends AbstractChunkOptimizer
 {
     /**
-     * @param InlineChunk[] $words1
-     * @param InlineChunk[] $words2
+     * @param list<InlineChunk> $words1
+     * @param list<InlineChunk> $words2
      */
     public function __construct(
         array $words1,

src/Entity/Pair.php

@@ -79,6 +79,7 @@ public static function create(mixed $first, mixed $second): Pair
      */
     public static function empty(): Pair
     {
+        /** @var ?Pair<null, null> $pair */
         static $pair = null;
         $pair ??= new Pair(null, null);
 

src/Entity/Side.php

@@ -69,13 +69,15 @@ public function select(mixed $left, mixed $right): mixed
 
     private static function left(): Side
     {
+        /** @var ?Side $left */
         static $left = null;
 
         return $left ??= new Side(self::LEFT);
     }
 
     private static function right(): Side
     {
+        /** @var ?Side $right */
         static $right = null;
 
         return $right ??= new Side(self::RIGHT);

src/Util/BitSet.php

@@ -122,6 +122,7 @@ public static function fromBinaryString(string $data): BitSet
             return $bitSet;
         }
 
+        /** @var list<int>|false $words */
         $words = unpack(PHP_INT_SIZE === 4 ? 'N*' : 'J*', $data);
         if ($words === false || count($words) === 0) {
             throw new InvalidArgumentException('Unable to unpack from binary string: ' . base64_encode($data));

src/Util/Character.php

@@ -68,6 +68,7 @@ public static function isContinuousScript(int $codePoint): bool
         }
 
         static $table = null;
+        /** @var array<int, false> $table */
         $table ??= require dirname(__DIR__, 2) . '/resources/NonContinuousScriptLookupTable.php';
 
         return $table[$codePoint] ?? true;