Updated Rector to commit 4904b4d7e9233eb9ac089a42de6020804fcb39e1

TomasVotruba · TomasVotruba · commit e8f5971daf04 · 2025-04-24T14:09:16.000Z
rectorphp/rector-src@4904b4d [type-declaration] Skip intersection type on TypedPropertyFromCreateMockAssignRector (#6863)
diff --git a/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector.php b/rules/TypeDeclaration/Rector/Class_/TypedPropertyFromCreateMockAssignRector.php
@@ -4,8 +4,10 @@
 namespace Rector\TypeDeclaration\Rector\Class_;
 
 use PhpParser\Node;
+use PhpParser\Node\IntersectionType;
 use PhpParser\Node\NullableType;
 use PhpParser\Node\Stmt\Class_;
+use PhpParser\Node\Stmt\Property;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use Rector\Enum\ClassName;
@@ -43,7 +45,7 @@ public function __construct(AssignToPropertyTypeInferer $assignToPropertyTypeInf
     }
     public function getRuleDefinition() : RuleDefinition
     {
-        return new RuleDefinition('Add typed property from assigned mock', [new CodeSample(<<<'CODE_SAMPLE'
+        return new RuleDefinition('Add "PHPUnit\\Framework\\MockObject\\MockObject" typed property from assigned mock to clearly separate from real objects', [new CodeSample(<<<'CODE_SAMPLE'
 use PHPUnit\Framework\TestCase;
 
 final class SomeTest extends TestCase
@@ -58,10 +60,11 @@ protected function setUp(): void
 CODE_SAMPLE
 , <<<'CODE_SAMPLE'
 use PHPUnit\Framework\TestCase;
+use PHPUnit\Framework\MockObject\MockObject;
 
 final class SomeTest extends TestCase
 {
-    private \PHPUnit\Framework\MockObject\MockObject $someProperty;
+    private MockObject $someProperty;
 
     protected function setUp(): void
     {
@@ -85,11 +88,11 @@ public function refactor(Node $node) : ?Node
         }
         $hasChanged = \false;
         foreach ($node->getProperties() as $property) {
-            // already use PHPUnit\Framework\MockObject\MockObject type
-            if ($property->type instanceof Node && $this->isObjectType($property->type, new ObjectType(ClassName::MOCK_OBJECT))) {
+            if (\count($property->props) !== 1) {
                 continue;
             }
-            if (\count($property->props) !== 1) {
+            // already use PHPUnit\Framework\MockObject\MockObject type
+            if ($this->isAlreadyTypedWithMockObject($property)) {
                 continue;
             }
             $propertyName = (string) $this->getName($property);
@@ -122,4 +125,15 @@ public function provideMinPhpVersion() : int
     {
         return PhpVersionFeature::TYPED_PROPERTIES;
     }
+    private function isAlreadyTypedWithMockObject(Property $property) : bool
+    {
+        if (!$property->type instanceof Node) {
+            return \false;
+        }
+        // complex type, used on purpose
+        if ($property->type instanceof IntersectionType) {
+            return \true;
+        }
+        return $this->isObjectType($property->type, new ObjectType(ClassName::MOCK_OBJECT));
+    }
 }
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'ba8614a8d2f09f3baf3c7ef930c0e26eb68e30d0';
+    public const PACKAGE_VERSION = '4904b4d7e9233eb9ac089a42de6020804fcb39e1';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2025-04-24 16:04:29';
+    public const RELEASE_DATE = '2025-04-24 21:06:39';
     /**
      * @var int
      */
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -512,8 +512,8 @@
         },
         {
             "name": "illuminate\/container",
-            "version": "v11.44.4",
-            "version_normalized": "11.44.4.0",
+            "version": "v11.44.5",
+            "version_normalized": "11.44.5.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/illuminate\/container.git",
@@ -569,8 +569,8 @@
         },
         {
             "name": "illuminate\/contracts",
-            "version": "v11.44.4",
-            "version_normalized": "11.44.4.0",
+            "version": "v11.44.5",
+            "version_normalized": "11.44.5.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/illuminate\/contracts.git",
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
