Bump to Rector ~2.0.0

composer.json

@@ -142,7 +142,7 @@
         "phpunit/phpunit": "10.5.3",
         "ramsey/collection": "^1.2",
         "ramsey/uuid": "^4.2.3",
-        "rector/rector": "1.2.10",
+        "rector/rector": "~2.0.0",
         "spiral/code-style": "^2.2",
         "spiral/nyholm-bridge": "^1.2",
         "spiral/testing": "^2.8",

rector.php

@@ -104,14 +104,10 @@
             // used by Configurator
             __DIR__ . '/src/Scaffolder/src/Command',
         ],
-
-        \Rector\PHPUnit\PHPUnit100\Rector\MethodCall\AssertIssetToAssertObjectHasPropertyRector::class => [
-            // ArrayAccess usage
-            __DIR__ . '/src/Session/tests/SessionTest.php',
-        ],
     ])
     ->withPhpSets(php81: true)
-    ->withPreparedSets(deadCode: true, phpunit: true)
+    ->withPreparedSets(deadCode: true)
+    ->withComposerBased(phpunit: true)
     ->withConfiguredRule(ClassPropertyAssignToConstructorPromotionRector::class, [
         ClassPropertyAssignToConstructorPromotionRector::RENAME_PROPERTY => false,
     ]);

src/Core/tests/Scope/UseCaseTest.php

@@ -79,7 +79,7 @@ public function testScopeBindingsAsNotSingletons(bool $theSame, string $alias, m
 
     public static function provideScopeBindingsAsNotSingletons(): iterable
     {
-        yield 'array-factory' => [false, 'foo', [Factory::class, 'makeStdClass']];
+        yield 'array-factory' => [false, 'foo', (new Factory())->makeStdClass(...)];
         yield 'class-name' => [false, SampleClass::class, SampleClass::class];
         yield 'object' => [true, stdClass::class, new stdClass()];
     }
@@ -107,11 +107,11 @@ public function testScopeDefinition(): void
                 self::assertNotSame($c1, $c2);
                 self::assertInstanceOf(stdClass::class, $obj2);
                 self::assertNotSame($obj1, $obj2);
-            }, bindings: ['foo' => [Factory::class, 'makeStdClass']]);
+            }, bindings: ['foo' => (new Factory())->makeStdClass(...)]);
 
             // $obj2 should be garbage collected
             self::assertCount(1, $this->weakMap);
-        }, bindings: ['foo' => [Factory::class, 'makeStdClass']]);
+        }, bindings: ['foo' => (new Factory())->makeStdClass(...)]);
 
         // $obj1 should be garbage collected
         self::assertEmpty($this->weakMap);
@@ -125,7 +125,7 @@ public function testScopeDefinition(): void
     public function testChildContainerResolvesDepsFromParent(): void
     {
         $root = new Container();
-        $root->bindSingleton('bar', [Factory::class, 'makeStdClass']);
+        $root->bindSingleton('bar', (new Factory())->makeStdClass(...));
         $root->bind(stdClass::class, new stdClass());
 
         $root->runScoped(function (ContainerInterface $c1) use ($root) {
@@ -149,7 +149,7 @@ public function testChildContainerResolvesDepsFromParent(): void
                     "Nested container mustn't create new instance using class name as key without definition."
                 );
             });
-        }, bindings: ['foo' => [Factory::class, 'makeStdClass']]);
+        }, bindings: ['foo' => (new Factory())->makeStdClass(...)]);
     }
 
     /**

src/Queue/src/Attribute/RetryPolicy.php

@@ -25,7 +25,7 @@
 class RetryPolicy
 {
     /**
-     * @param 0|positive-int $maxAttempts
+     * @param int<0, max> $maxAttempts
      * @param positive-int $delay in seconds.
      */
     public function __construct(

src/Queue/src/RetryPolicy.php

@@ -11,12 +11,12 @@
 final class RetryPolicy implements RetryPolicyInterface
 {
     /**
-     * @var positive-int|0
+     * @var int<0, max>
      */
     private readonly int $maxAttempts;
 
     /**
-     * @var positive-int|0
+     * @var int<0, max>
      */
     private readonly int $delay;
 
@@ -50,7 +50,7 @@ public function __construct(int $maxAttempts, int $delay, float $multiplier = 1)
     }
 
     /**
-     * @param positive-int|0 $attempts
+     * @param int<0, max> $attempts
      *
      * @return positive-int
      */
@@ -60,7 +60,7 @@ public function getDelay(int $attempts = 0): int
     }
 
     /**
-     * @param positive-int|0 $attempts
+     * @param int<0, max> $attempts
      */
     public function isRetryable(\Throwable $exception, int $attempts = 0): bool
     {

src/Queue/src/RetryPolicyInterface.php

@@ -7,12 +7,12 @@
 interface RetryPolicyInterface
 {
     /**
-     * @param positive-int|0 $attempts
+     * @param int<0, max> $attempts
      */
     public function isRetryable(\Throwable $exception, int $attempts = 0): bool;
 
     /**
-     * @param positive-int|0 $attempts
+     * @param int<0, max> $attempts
      *
      * @return positive-int
      */

src/Storage/src/Bucket/ReadableInterface.php

@@ -46,7 +46,7 @@ public function getLastModified(string $pathname): int;
     /**
      * Returns the file size in bytes.
      *
-     * @return positive-int|0
+     * @return int<0, max>
      * @throws FileOperationException
      */
     public function getSize(string $pathname): int;

src/Storage/src/Bucket/ReadableTrait.php

@@ -63,7 +63,7 @@ public function getLastModified(string $pathname): int
     }
 
     /**
-     * @return positive-int|0
+     * @return int<0, max>
      */
     public function getSize(string $pathname): int
     {

src/Storage/src/File/ReadableInterface.php

@@ -47,7 +47,7 @@ public function getLastModified(): int;
     /**
      * {@see BucketInterface::getSize()}
      *
-     * @return positive-int|0
+     * @return int<0, max>
      * @throws FileOperationException
      */
     public function getSize(): int;

src/Storage/src/File/ReadableTrait.php

@@ -47,7 +47,7 @@ public function getLastModified(): int
     }
 
     /**
-     * @return positive-int|0
+     * @return int<0, max>
      */
     public function getSize(): int
     {

src/Storage/src/Storage/ReadableInterface.php

@@ -45,7 +45,7 @@ public function exists(string|\Stringable $id): bool;
     /**
      * {@see BucketInterface::getLastModified()}
      *
-     * @return positive-int|0
+     * @return int<0, max>
      * @throws FileOperationException
      * @throws InvalidArgumentException
      */
@@ -54,7 +54,7 @@ public function getLastModified(string|\Stringable $id): int;
     /**
      * {@see BucketInterface::getSize()}
      *
-     * @return positive-int|0
+     * @return int<0, max>
      * @throws FileOperationException
      * @throws InvalidArgumentException
      */

src/Storage/src/Storage/ReadableTrait.php

@@ -40,7 +40,7 @@ public function exists(string|\Stringable $id): bool
     }
 
     /**
-     * @return positive-int|0
+     * @return int<0, max>
      */
     public function getLastModified(string|\Stringable $id): int
     {
@@ -50,7 +50,7 @@ public function getLastModified(string|\Stringable $id): int
     }
 
     /**
-     * @return positive-int|0
+     * @return int<0, max>
      */
     public function getSize(string|\Stringable $id): int
     {