Updated Rector to commit 4997962de1f53c449dadbef7025bffe5ca41e63c

rectorphp/rector-src@4997962 Bump PHPStan to 2.1.38 (#7879)

Author: TomasVotruba

vendor/composer/autoload_classmap.php

@@ -2052,6 +2052,7 @@
     'Rector\\PHPUnit\\PHPUnit110\\Rector\\Class_\\NamedArgumentForDataProviderRector' => $vendorDir . '/rector/rector-phpunit/rules/PHPUnit110/Rector/Class_/NamedArgumentForDataProviderRector.php',
     'Rector\\PHPUnit\\PHPUnit120\\Rector\\CallLike\\CreateStubOverCreateMockArgRector' => $vendorDir . '/rector/rector-phpunit/rules/PHPUnit120/Rector/CallLike/CreateStubOverCreateMockArgRector.php',
     'Rector\\PHPUnit\\PHPUnit120\\Rector\\ClassMethod\\ExpressionCreateMockToCreateStubRector' => $vendorDir . '/rector/rector-phpunit/rules/PHPUnit120/Rector/ClassMethod/ExpressionCreateMockToCreateStubRector.php',
+    'Rector\\PHPUnit\\PHPUnit120\\Rector\\Class_\\AllowMockObjectsForDataProviderRector' => $vendorDir . '/rector/rector-phpunit/rules/PHPUnit120/Rector/Class_/AllowMockObjectsForDataProviderRector.php',
     'Rector\\PHPUnit\\PHPUnit120\\Rector\\Class_\\AllowMockObjectsWhereParentClassRector' => $vendorDir . '/rector/rector-phpunit/rules/PHPUnit120/Rector/Class_/AllowMockObjectsWhereParentClassRector.php',
     'Rector\\PHPUnit\\PHPUnit120\\Rector\\Class_\\AllowMockObjectsWithoutExpectationsAttributeRector' => $vendorDir . '/rector/rector-phpunit/rules/PHPUnit120/Rector/Class_/AllowMockObjectsWithoutExpectationsAttributeRector.php',
     'Rector\\PHPUnit\\PHPUnit120\\Rector\\Class_\\AssertIsTypeMethodCallRector' => $vendorDir . '/rector/rector-phpunit/rules/PHPUnit120/Rector/Class_/AssertIsTypeMethodCallRector.php',

vendor/composer/autoload_static.php

@@ -2312,6 +2312,7 @@ class ComposerStaticInit6374fd21a3f525a40760d79e3596b56b
         'Rector\\PHPUnit\\PHPUnit110\\Rector\\Class_\\NamedArgumentForDataProviderRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/PHPUnit110/Rector/Class_/NamedArgumentForDataProviderRector.php',
         'Rector\\PHPUnit\\PHPUnit120\\Rector\\CallLike\\CreateStubOverCreateMockArgRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/PHPUnit120/Rector/CallLike/CreateStubOverCreateMockArgRector.php',
         'Rector\\PHPUnit\\PHPUnit120\\Rector\\ClassMethod\\ExpressionCreateMockToCreateStubRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/PHPUnit120/Rector/ClassMethod/ExpressionCreateMockToCreateStubRector.php',
+        'Rector\\PHPUnit\\PHPUnit120\\Rector\\Class_\\AllowMockObjectsForDataProviderRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/PHPUnit120/Rector/Class_/AllowMockObjectsForDataProviderRector.php',
         'Rector\\PHPUnit\\PHPUnit120\\Rector\\Class_\\AllowMockObjectsWhereParentClassRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/PHPUnit120/Rector/Class_/AllowMockObjectsWhereParentClassRector.php',
         'Rector\\PHPUnit\\PHPUnit120\\Rector\\Class_\\AllowMockObjectsWithoutExpectationsAttributeRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/PHPUnit120/Rector/Class_/AllowMockObjectsWithoutExpectationsAttributeRector.php',
         'Rector\\PHPUnit\\PHPUnit120\\Rector\\Class_\\AssertIsTypeMethodCallRector' => __DIR__ . '/..' . '/rector/rector-phpunit/rules/PHPUnit120/Rector/Class_/AssertIsTypeMethodCallRector.php',

vendor/composer/installed.json

@@ -1818,12 +1818,12 @@
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/rectorphp\/rector-phpunit.git",
-                "reference": "43e5326f462d78161a173844cf00403ed041fa8b"
+                "reference": "1993f6b70c1e8ee8241c56c3876a13f52facfb13"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/43e5326f462d78161a173844cf00403ed041fa8b",
-                "reference": "43e5326f462d78161a173844cf00403ed041fa8b",
+                "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpunit\/zipball\/1993f6b70c1e8ee8241c56c3876a13f52facfb13",
+                "reference": "1993f6b70c1e8ee8241c56c3876a13f52facfb13",
                 "shasum": ""
             },
             "require": {
@@ -1850,7 +1850,7 @@
                 "tomasvotruba\/unused-public": "^2.2",
                 "tracy\/tracy": "^2.11"
             },
-            "time": "2026-02-04T12:03:46+00:00",
+            "time": "2026-02-04T12:33:44+00:00",
             "default-branch": true,
             "type": "rector-extension",
             "extra": {

vendor/composer/installed.php

@@ -9,7 +9,7 @@
  */
 final class GeneratedConfig
 {
-    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main 46e4f77'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main a110e2f'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 43e5326'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main eadb590'));
+    public const EXTENSIONS = array('rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => NULL, 'version' => 'dev-main 46e4f77'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => NULL, 'version' => 'dev-main a110e2f'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => NULL, 'version' => 'dev-main 1993f6b'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/rector-build/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => NULL, 'version' => 'dev-main eadb590'));
     private function __construct()
     {
     }

vendor/rector/extension-installer/src/GeneratedConfig.php

@@ -5,6 +5,7 @@
 
 use Rector\Config\RectorConfig;
 use Rector\PHPUnit\PHPUnit120\Rector\CallLike\CreateStubOverCreateMockArgRector;
+use Rector\PHPUnit\PHPUnit120\Rector\Class_\AllowMockObjectsForDataProviderRector;
 use Rector\PHPUnit\PHPUnit120\Rector\Class_\AllowMockObjectsWhereParentClassRector;
 use Rector\PHPUnit\PHPUnit120\Rector\Class_\AllowMockObjectsWithoutExpectationsAttributeRector;
 use Rector\PHPUnit\PHPUnit120\Rector\Class_\AssertIsTypeMethodCallRector;
@@ -20,6 +21,7 @@
         ExpressionCreateMockToCreateStubRector::class,
         PropertyCreateMockToCreateStubRector::class,
         AllowMockObjectsWhereParentClassRector::class,
+        AllowMockObjectsForDataProviderRector::class,
         // experimental, from PHPUnit 12.5.2
         // @see https://github.com/sebastianbergmann/phpunit/commit/24c208d6a340c3071f28a9b5cce02b9377adfd43
         AllowMockObjectsWithoutExpectationsAttributeRector::class,

vendor/rector/rector-phpunit/config/sets/phpunit120.php

@@ -16,6 +16,7 @@
 use Rector\BetterPhpDocParser\PhpDocManipulator\PhpDocTagRemover;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\PhpAttribute\NodeFactory\PhpAttributeGroupFactory;
+use Rector\PHPUnit\Enum\PHPUnitAttribute;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Rector\Rector\AbstractRector;
 use Rector\Reflection\ReflectionResolver;
@@ -56,10 +57,6 @@ final class DataProviderAnnotationToAttributeRector extends AbstractRector imple
      * @readonly
      */
     private ReflectionProvider $reflectionProvider;
-    /**
-     * @var string
-     */
-    private const DATA_PROVIDER_CLASS = 'PHPUnit\Framework\Attributes\DataProvider';
     public function __construct(TestsNodeAnalyzer $testsNodeAnalyzer, PhpAttributeGroupFactory $phpAttributeGroupFactory, PhpDocTagRemover $phpDocTagRemover, ReflectionResolver $reflectionResolver, DocBlockUpdater $docBlockUpdater, PhpDocInfoFactory $phpDocInfoFactory, ReflectionProvider $reflectionProvider)
     {
         $this->testsNodeAnalyzer = $testsNodeAnalyzer;
@@ -123,7 +120,7 @@ public function refactor(Node $node): ?Node
         if (!$this->testsNodeAnalyzer->isInTestClass($node)) {
             return null;
         }
-        if (!$this->reflectionProvider->hasClass(self::DATA_PROVIDER_CLASS)) {
+        if (!$this->reflectionProvider->hasClass(PHPUnitAttribute::DATA_PROVIDER)) {
             return null;
         }
         $phpDocInfo = $this->phpDocInfoFactory->createFromNode($node);
@@ -178,7 +175,7 @@ private function createAttributeGroup(ClassMethod $classMethod, string $original
             }
             $attributeGroup = $this->phpAttributeGroupFactory->createFromClassWithItems('PHPUnit\Framework\Attributes\DataProviderExternal', [$className . '::class', $methodName]);
         } else {
-            $attributeGroup = $this->phpAttributeGroupFactory->createFromClassWithItems(self::DATA_PROVIDER_CLASS, [$methodName]);
+            $attributeGroup = $this->phpAttributeGroupFactory->createFromClassWithItems(PHPUnitAttribute::DATA_PROVIDER, [$methodName]);
         }
         foreach ($classMethod->attrGroups as $existingAttributeGroup) {
             if ($this->nodeComparator->areNodesEqual($existingAttributeGroup, $attributeGroup)) {

vendor/rector/rector-phpunit/rules/AnnotationsToAttributes/Rector/ClassMethod/DataProviderAnnotationToAttributeRector.php

@@ -32,6 +32,21 @@ public function __construct(BetterNodeFinder $betterNodeFinder, NodeNameResolver
         $this->nodeNameResolver = $nodeNameResolver;
         $this->variableFinder = $variableFinder;
     }
+    public function hasMethodCallWithoutExpects(ClassMethod $classMethod): bool
+    {
+        /** @var array<Expr\MethodCall> $methodCalls */
+        $methodCalls = $this->betterNodeFinder->findInstancesOfScoped((array) $classMethod->stmts, [MethodCall::class]);
+        foreach ($methodCalls as $methodCall) {
+            if (!$this->nodeNameResolver->isName($methodCall->name, 'method')) {
+                continue;
+            }
+            if ($methodCall->var instanceof MethodCall) {
+                continue;
+            }
+            return \true;
+        }
+        return \false;
+    }
     public function isUsedForMocking(Expr $expr, ClassMethod $classMethod): bool
     {
         if (!$expr instanceof Variable) {

vendor/rector/rector-phpunit/rules/CodeQuality/NodeAnalyser/MockObjectExprDetector.php

@@ -0,0 +1,143 @@
+<?php
+
+declare (strict_types=1);
+namespace Rector\PHPUnit\PHPUnit120\Rector\Class_;
+
+use PhpParser\Node;
+use PhpParser\Node\Attribute;
+use PhpParser\Node\AttributeGroup;
+use PhpParser\Node\Name\FullyQualified;
+use PhpParser\Node\Stmt\Class_;
+use PHPStan\Reflection\ReflectionProvider;
+use Rector\Doctrine\NodeAnalyzer\AttributeFinder;
+use Rector\PHPUnit\CodeQuality\NodeAnalyser\MockObjectExprDetector;
+use Rector\PHPUnit\Enum\PHPUnitAttribute;
+use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
+use Rector\Rector\AbstractRector;
+use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
+use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+/**
+ * @see \Rector\PHPUnit\Tests\PHPUnit120\Rector\Class_\AllowMockObjectsForDataProviderRector\AllowMockObjectsForDataProviderRectorTest
+ */
+final class AllowMockObjectsForDataProviderRector extends AbstractRector
+{
+    /**
+     * @readonly
+     */
+    private TestsNodeAnalyzer $testsNodeAnalyzer;
+    /**
+     * @readonly
+     */
+    private AttributeFinder $attributeFinder;
+    /**
+     * @readonly
+     */
+    private ReflectionProvider $reflectionProvider;
+    /**
+     * @readonly
+     */
+    private MockObjectExprDetector $mockObjectExprDetector;
+    public function __construct(TestsNodeAnalyzer $testsNodeAnalyzer, AttributeFinder $attributeFinder, ReflectionProvider $reflectionProvider, MockObjectExprDetector $mockObjectExprDetector)
+    {
+        $this->testsNodeAnalyzer = $testsNodeAnalyzer;
+        $this->attributeFinder = $attributeFinder;
+        $this->reflectionProvider = $reflectionProvider;
+        $this->mockObjectExprDetector = $mockObjectExprDetector;
+    }
+    public function getNodeTypes(): array
+    {
+        return [Class_::class];
+    }
+    /**
+     * @param Class_ $node
+     */
+    public function refactor(Node $node): ?Class_
+    {
+        if ($this->shouldSkipClass($node)) {
+            return null;
+        }
+        if (!$this->hasDataProviderMethodWithExpectLessMethodMock($node)) {
+            return null;
+        }
+        // add attribute
+        $node->attrGroups[] = new AttributeGroup([new Attribute(new FullyQualified(PHPUnitAttribute::ALLOW_MOCK_OBJECTS_WITHOUT_EXPECTATIONS))]);
+        return $node;
+    }
+    public function getRuleDefinition(): RuleDefinition
+    {
+        return new RuleDefinition('Add #[AllowMockObjectsWithoutExpectations] attribute to PHPUnit test classes that have methods with data providers and mock objects without expectations', [new CodeSample(<<<'CODE_SAMPLE'
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+final class SomeClass extends TestCase
+{
+    #[DataProvider('someDataProvider')]
+    public function test()
+    {
+        $someMock = $this->createMock(\stdClass::class);
+        $someMock->expects('method')->willReturn(true);
+    }
+
+    public static function someDataProvider(): iterable
+    {
+        yield [1];
+        yield [2];
+        yield [3];
+    }
+}
+CODE_SAMPLE
+, <<<'CODE_SAMPLE'
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+
+#[\PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations]
+final class SomeClass extends TestCase
+{
+    #[DataProvider('someDataProvider')]
+    public function test()
+    {
+        $someMock = $this->createMock(\stdClass::class);
+        $someMock->expects('method')->willReturn(true);
+    }
+
+    public static function someDataProvider(): iterable
+    {
+        yield [1];
+        yield [2];
+        yield [3];
+    }
+}
+CODE_SAMPLE
+)]);
+    }
+    private function shouldSkipClass(Class_ $class): bool
+    {
+        if (!$this->testsNodeAnalyzer->isInTestClass($class)) {
+            return \true;
+        }
+        // attribute must exist for the rule to work
+        if (!$this->reflectionProvider->hasClass(PHPUnitAttribute::ALLOW_MOCK_OBJECTS_WITHOUT_EXPECTATIONS)) {
+            return \true;
+        }
+        // already filled
+        return $this->attributeFinder->hasAttributeByClasses($class, [PHPUnitAttribute::ALLOW_MOCK_OBJECTS_WITHOUT_EXPECTATIONS]);
+    }
+    private function hasDataProviderMethodWithExpectLessMethodMock(Class_ $class): bool
+    {
+        // has a test method, that contains a ->method() call without expects()
+        // and has a data provider attribute?
+        foreach ($class->getMethods() as $classMethod) {
+            if (!$this->testsNodeAnalyzer->isTestClassMethod($classMethod)) {
+                continue;
+            }
+            if (!$this->attributeFinder->hasAttributeByClasses($classMethod, [PHPUnitAttribute::DATA_PROVIDER])) {
+                continue;
+            }
+            // has expects-less mock objects
+            if ($this->mockObjectExprDetector->hasMethodCallWithoutExpects($classMethod)) {
+                return \true;
+            }
+        }
+        return \false;
+    }
+}

vendor/rector/rector-phpunit/rules/PHPUnit120/Rector/Class_/AllowMockObjectsForDataProviderRector.php

@@ -46,4 +46,8 @@ final class PHPUnitAttribute
      * @var string
      */
     public const ALLOW_MOCK_OBJECTS_WITHOUT_EXPECTATIONS = 'PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations';
+    /**
+     * @var string
+     */
+    public const DATA_PROVIDER = 'PHPUnit\Framework\Attributes\DataProvider';
 }