fix

rectorphp · Nov 24, 2024 · ea73380 · ea73380
1 parent 19431d5
commit ea73380
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/...Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector/Fixture/aliased_class.php.inc b/...Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector/Fixture/aliased_class.php.inc
@@ -26,7 +26,7 @@ use Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativeProper
 
 final class AliasedClass
 {
-    private ?\Rector\Tests\CodeQuality\Rector\Class_\DynamicDocBlockPropertyToNativePropertyRector\Source\SomeDependency $someDependency;
+    private ?SomeSource\SomeDependency $someDependency;
     public function run(): void
     {
         $this->someDependency = new SomeSource\SomeDependency();

diff --git a/...ty/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector/Fixture/bare_class.php.inc b/...ty/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();

diff --git a/...amicDocBlockPropertyToNativePropertyRector/Fixture/improve_existing_property_type.php.inc b/...amicDocBlockPropertyToNativePropertyRector/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();

diff --git a/.../Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector/Fixture/include_null.php.inc b/.../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;
 }
 
 ?>
diff --git a/...ity/Rector/Class_/DynamicDocBlockPropertyToNativePropertyRector/Fixture/some_test.php.inc b/...ity/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();

diff --git a/...namicDocBlockPropertyToNativePropertyRector/Fixture/with_other_existing_attribute.php.inc b/...namicDocBlockPropertyToNativePropertyRector/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();

diff --git a/rules/TypeDeclaration/PHPStan/ObjectTypeSpecifier.php b/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;

diff --git a/src/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php b/src/PHPStanStaticTypeMapper/TypeMapper/ObjectTypeMapper.php
@@ -71,7 +71,7 @@ public function mapToPhpParserNode(Type $type, string $typeKind): ?Node
         }
 
         if ($type instanceof ShortenedObjectType || $type instanceof AliasedObjectType) {
-            return new FullyQualified($type->getFullyQualifiedName());
+            return new Name($type->getClassName());
         }
 
         if ($type instanceof FullyQualifiedObjectType) {