[CodeQuality] Handle aliased object type from docblock on DynamicDocB…

…lockPropertyToNativePropertyRector (#6493)

* [CodeQuality] Handle aliased object type on DynamicDocBlockPropertyToNativePropertyRector

* fix

* fix

rules-tests/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector/Fixture/aliased_class.php.inc

@@ -0,0 +1,36 @@
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Source as SomeSource;
+
+/**
+ * @property SomeSource\SomeDependency $someDependency
+ */
+#[\AllowDynamicProperties]
+final class AliasedClass
+{
+    public function run(): void
+    {
+        $this->someDependency = new SomeSource\SomeDependency();
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Fixture;
+
+use Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Source as SomeSource;
+
+final class AliasedClass
+{
+    private ?SomeSource\SomeDependency $someDependency;
+    public function run(): void
+    {
+        $this->someDependency = new SomeSource\SomeDependency();
+    }
+}
+
+?>

rules-tests/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector/Fixture/bare_class.php.inc

@@ -26,7 +26,7 @@ use Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativeProper
 
 final class BareClass
 {
-    private ?\Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Source\SomeDependency $someDependency;
+    private ?SomeDependency $someDependency;
     public function run(): void
     {
         $this->someDependency = new SomeDependency();

rules-tests/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector/Fixture/improve_existing_property_type.php.inc

@@ -31,7 +31,7 @@ use Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativeProper
 
 final class ImproveExistingPropertyType extends TestCase
 {
-    private \Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Source\SomeDependency $someDependency;
+    private SomeDependency $someDependency;
     protected function setUp(): void
     {
         parent::setUp();

rules-tests/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector/Fixture/include_null.php.inc

@@ -23,7 +23,7 @@ use Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativeProper
 
 final class IncludeNull
 {
-    protected ?\Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Source\SomeDependency $someDependency = null;
+    protected ?SomeDependency $someDependency = null;
 }
 
 ?>

rules-tests/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector/Fixture/some_test.php.inc

@@ -29,7 +29,7 @@ use Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativeProper
 
 final class SomeTest extends TestCase
 {
-    private ?\Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Source\SomeDependency $someDependency;
+    private ?SomeDependency $someDependency;
     protected function setUp(): void
     {
         parent::setUp();

rules-tests/CodeQuality/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector/Fixture/with_other_existing_attribute.php.inc

@@ -28,7 +28,7 @@ use Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativeProper
 #[\OtherAttribute]
 final class WithOtherExistingAttribute
 {
-    private ?\Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Source\SomeDependency $someDependency;
+    private ?SomeDependency $someDependency;
     public function run(): void
     {
         $this->someDependency = new SomeDependency();

rules/TypeDeclaration/PHPStan/ObjectTypeSpecifier.php

@@ -153,16 +153,16 @@ private function processAliasedObject(
     ): ?AliasedObjectType {
         // A. is alias in use statement matching this class alias
         if ($alias === $className) {
-            return new AliasedObjectType($alias, $fullyQualifiedName);
+            return new AliasedObjectType($className, $fullyQualifiedName);
         }
 
         // B. is aliased classes matching the class name
         if ($useName === $className) {
-            return new AliasedObjectType($alias, $fullyQualifiedName);
+            return new AliasedObjectType($className, $fullyQualifiedName);
         }
 
         if (str_starts_with($className, $alias . '\\')) {
-            return new AliasedObjectType($alias, $fullyQualifiedName . ltrim($className, $alias));
+            return new AliasedObjectType($className, $fullyQualifiedName . ltrim($className, $alias));
         }
 
         return null;

src/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php

@@ -70,11 +70,7 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
             return new Name('self');
         }
 
-        if ($type instanceof ShortenedObjectType) {
-            return new FullyQualified($type->getFullyQualifiedName());
-        }
-
-        if ($type instanceof AliasedObjectType) {
+        if ($type instanceof ShortenedObjectType || $type instanceof AliasedObjectType) {
             return new Name($type->getClassName());
         }