[TypeDeclaration] Use native type detection instead of docblock on As…

…signToPropertyTypeInferer for TypedPropertyFromAssignsRector (#4754)

Co-authored-by: GitHub Action <actions@github.com>

rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/Fixture/non_nullable_mock_object.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class NonNullableMockObject extends TestCase
+{
+    private $someValue;
+
+    protected function setUp(): void
+    {
+        $this->someValue = $this->createMock('SomeClass');
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class NonNullableMockObject extends TestCase
+{
+    private \PHPUnit\Framework\MockObject\MockObject $someValue;
+
+    protected function setUp(): void
+    {
+        $this->someValue = $this->createMock('SomeClass');
+    }
+}
+
+?>

rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/Fixture/non_nullable_mock_object_with_var.php.inc

@@ -0,0 +1,41 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class NonNullableMockObjectWithVar extends TestCase
+{
+    /**
+     * @var DateTime&MockObject
+     */
+    private $someValue;
+
+    protected function setUp(): void
+    {
+        $this->someValue = $this->createMock('DateTime');
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector\Fixture;
+
+use PHPUnit\Framework\TestCase;
+
+final class NonNullableMockObjectWithVar extends TestCase
+{
+    /**
+     * @var DateTime&MockObject
+     */
+    private \PHPUnit\Framework\MockObject\MockObject $someValue;
+
+    protected function setUp(): void
+    {
+        $this->someValue = $this->createMock('DateTime');
+    }
+}
+
+?>

rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/Fixture/nullable_mock_object.php.inc

@@ -0,0 +1,49 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector\Fixture;
+
+use DateTime;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class NullableMockObject extends TestCase
+{
+    /**
+     * @var DateTime&MockObject
+     */
+    private $property;
+
+    public function testExample(): void
+    {
+        $this->property = $this->createMock(DateTime::class);
+        $this->property->expects(self::once())->method('format');
+        $this->property->format('Y');
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector\Fixture;
+
+use DateTime;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class NullableMockObject extends TestCase
+{
+    /**
+     * @var DateTime&MockObject
+     */
+    private ?\PHPUnit\Framework\MockObject\MockObject $property = null;
+
+    public function testExample(): void
+    {
+        $this->property = $this->createMock(DateTime::class);
+        $this->property->expects(self::once())->method('format');
+        $this->property->format('Y');
+    }
+}
+
+?>

rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/Fixture/property_with_default_null.php.inc

@@ -33,7 +33,7 @@ namespace Rector\Tests\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsR
 
 final class PropertyWithDefaultNull
 {
-    private ?string $cacheFile = null;
+    private $cacheFile = null;
     private ?array $cacheFiles = null;
 
     /**

rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/FixtureComplexTypes/intersection_type_with_setup.php.inc

@@ -37,7 +37,10 @@ use PHPUnit\Framework\TestCase;
 
 class IntersectionTypeWithSetup extends TestCase
 {
-    private \DateTime&\PHPUnit\Framework\MockObject\MockObject $property;
+    /**
+     * @var DateTime&MockObject
+     */
+    private \PHPUnit\Framework\MockObject\MockObject $property;
 
     public function setUp(): void
     {

rules-tests/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector/FixtureComplexTypes/nullable_intersection_type.php.inc

@@ -33,7 +33,10 @@ use PHPUnit\Framework\TestCase;
 
 class NullableIntersectionType extends TestCase
 {
-    private (\DateTime&\PHPUnit\Framework\MockObject\MockObject)|null $property = null;
+    /**
+     * @var DateTime&MockObject
+     */
+    private ?\PHPUnit\Framework\MockObject\MockObject $property = null;
 
     public function testExample(): void
     {

rules/DeadCode/PhpDoc/DeadVarTagValueNodeAnalyzer.php

@@ -4,6 +4,7 @@
 
 namespace Rector\DeadCode\PhpDoc;
 
+use PHPStan\Type\IntersectionType;
 use PhpParser\Node\Stmt\Property;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use PHPStan\Type\UnionType;
@@ -29,7 +30,7 @@ public function isDead(VarTagValueNode $varTagValueNode, Property $property): bo
         $docType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($varTagValueNode->type, $property);
 
         if ($propertyType instanceof UnionType && ! $docType instanceof UnionType) {
-            return true;
+            return ! $docType instanceof IntersectionType;
         }
 
         if (! $this->typeComparator->arePhpParserAndPhpStanPhpDocTypesEqual(

rules/TypeDeclaration/TypeInferer/AssignToPropertyTypeInferer.php

@@ -103,7 +103,7 @@ private function shouldSkipWithDifferentDefaultValueType(?Expr $expr, Type $infe
 
     private function resolveExprStaticTypeIncludingDimFetch(Assign $assign): Type
     {
-        $exprStaticType = $this->nodeTypeResolver->getType($assign->expr);
+        $exprStaticType = $this->nodeTypeResolver->getNativeType($assign->expr);
         if ($assign->var instanceof ArrayDimFetch) {
             return new ArrayType(new MixedType(), $exprStaticType);
         }