Update dev dependencies

Author: mspirkov

composer.json

@@ -18,10 +18,10 @@
     "require-dev": {
         "ext-tokenizer": "*",
         "phpunit/phpunit": "^9.5",
-        "phpstan/phpstan": "^1.8",
-        "phpstan/phpstan-phpunit": "^1.1",
-        "phpstan/extension-installer": "^1.1",
-        "rector/rector": "^0.13.9",
+        "phpstan/phpstan": "^2.1",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpstan/extension-installer": "^1.4",
+        "rector/rector": "^2.2",
         "phpbench/phpbench": "^1.2",
         "psalm/phar": "^4"
     },

composer.lock

@@ -33,6 +33,6 @@ parameters:
             path: tests/unit/Types/CompoundTest.php
 
         -
-            message: "#^Parameter \\#1 \\$argument of class ReflectionClass constructor expects class\\-string\\<Foo\\\\Bar\\>\\|Foo\\\\Bar\\, string given\\.$#"
+            message: "#^Parameter \\#1 \\$objectOrClass of class ReflectionClass constructor expects class\\-string\\<Foo\\\\Bar\\>\\|Foo\\\\Bar\\, string given\\.$#"
             count: 1
             path: tests/unit/Types/ContextFactoryTest.php

phpstan.neon

@@ -2,26 +2,24 @@
 
 declare(strict_types=1);
 
+use Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector;
 use Rector\CodeQuality\Rector\Class_\InlineConstructorDefaultToPropertyRector;
 use Rector\Config\RectorConfig;
-use Rector\Set\ValueObject\DowngradeLevelSetList;
-use Rector\Set\ValueObject\LevelSetList;
+use Rector\TypeDeclaration\Rector\Closure\ClosureReturnTypeRector;
+use Rector\ValueObject\PhpVersion;
 
-return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->paths([
+return RectorConfig::configure()
+    ->withPaths([
         __DIR__ . '/src',
-        __DIR__ . '/tests/unit'
+        __DIR__ . '/tests/unit',
+    ])
+    ->withImportNames()
+    ->withPhpVersion(PhpVersion::PHP_74)
+    ->withPHPStanConfigs([
+        __DIR__ . '/phpstan.neon',
+    ])
+    ->withRules([
+        InlineConstructorDefaultToPropertyRector::class,
+        CompleteDynamicPropertiesRector::class,
+        ClosureReturnTypeRector::class,
     ]);
-
-    // register a single rule
-    $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
-    $rectorConfig->rule(Rector\CodeQuality\Rector\Class_\CompleteDynamicPropertiesRector::class);
-    $rectorConfig->rule(Rector\TypeDeclaration\Rector\Closure\AddClosureReturnTypeRector::class);
-    $rectorConfig->rule(Rector\PHPUnit\Rector\Class_\AddProphecyTraitRector::class);
-    $rectorConfig->importNames();
-
-    // define sets of rules
-    $rectorConfig->sets([
-        DowngradeLevelSetList::DOWN_TO_PHP_73
-    ]);
-};

rector.php

@@ -324,18 +324,16 @@ function (ObjectShapeItemNode $item) use ($context): ObjectShapeItem {
 
             case IntersectionTypeNode::class:
                 return new Intersection(
-                    array_filter(
-                        array_map(
-                            function (TypeNode $nestedType) use ($context): Type {
-                                $type = $this->createType($nestedType, $context);
-                                if ($type instanceof AggregatedType) {
-                                    return new Expression($type);
-                                }
-
-                                return $type;
-                            },
-                            $type->types
-                        )
+                    array_map(
+                        function (TypeNode $nestedType) use ($context): Type {
+                            $type = $this->createType($nestedType, $context);
+                            if ($type instanceof AggregatedType) {
+                                return new Expression($type);
+                            }
+
+                            return $type;
+                        },
+                        $type->types
                     )
                 );
 
@@ -346,18 +344,16 @@ function (TypeNode $nestedType) use ($context): Type {
 
             case UnionTypeNode::class:
                 return new Compound(
-                    array_filter(
-                        array_map(
-                            function (TypeNode $nestedType) use ($context): Type {
-                                $type = $this->createType($nestedType, $context);
-                                if ($type instanceof AggregatedType) {
-                                    return new Expression($type);
-                                }
-
-                                return $type;
-                            },
-                            $type->types
-                        )
+                    array_map(
+                        function (TypeNode $nestedType) use ($context): Type {
+                            $type = $this->createType($nestedType, $context);
+                            if ($type instanceof AggregatedType) {
+                                return new Expression($type);
+                            }
+
+                            return $type;
+                        },
+                        $type->types
                     )
                 );
 

src/TypeResolver.php

@@ -29,7 +29,6 @@
 use RuntimeException;
 
 /**
- * @covers ::<private>
  * @coversDefaultClass \phpDocumentor\Reflection\TypeResolver
  */
 class CollectionResolverTest extends TestCase
@@ -187,7 +186,7 @@ public function testResolvingCollectionOfCollection(): void
         $this->assertArrayHasKey(0, $types);
         $this->assertEquals(new Compound([new String_(), new Integer(), new Float_()]), $types[0]);
 
-        $this->assertArrayHasKey(0, $types);
+        $this->assertArrayHasKey(1, $types);
         $this->assertInstanceOf(Generic::class, $types[1]);
         $this->assertSame('\\ArrayObject', (string) $types[1]->getFqsen());
 

tests/unit/CollectionResolverTest.php

@@ -19,7 +19,6 @@
 
 /**
  * @coversDefaultClass \phpDocumentor\Reflection\FqsenResolver
- * @covers ::<private>
  */
 final class FqsenResolverTest extends TestCase
 {

tests/unit/FqsenResolverTest.php

@@ -19,7 +19,6 @@
 use RuntimeException;
 
 /**
- * @covers ::<private>
  * @coversDefaultClass \phpDocumentor\Reflection\TypeResolver
  */
 class IntegerRangeResolverTest extends TestCase

tests/unit/IntegerRangeResolverTest.php

@@ -21,7 +21,6 @@
 use PHPUnit\Framework\TestCase;
 
 /**
- * @covers ::<private>
  * @coversDefaultClass \phpDocumentor\Reflection\TypeResolver
  */
 class NumericResolverTest extends TestCase

tests/unit/NumericResolverTest.php

@@ -49,7 +49,5 @@ public function testCanBeInstantiatedUsingDeprecatedFqsen(): void
         $false = new \phpDocumentor\Reflection\Types\False_();
 
         $this->assertSame('false', (string) $false);
-        $this->assertInstanceOf(False_::class, $false);
-        $this->assertInstanceOf(\phpDocumentor\Reflection\Types\False_::class, $false);
     }
 }