add file path to tests

rectorphp · Jun 30, 2024 · 2ea0fa8 · 2ea0fa8
1 parent a913de8
commit 2ea0fa8
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 84 deletions.
diff --git a/...ClassMethod/ReturnTypeFromStrictTypedCallRector/Fixture/skip_union_types_on_php74.php.inc b/...ClassMethod/ReturnTypeFromStrictTypedCallRector/Fixture/skip_union_types_on_php74.php.inc
diff --git a/...ClassMethod/ReturnTypeFromStrictTypedCallRector/FixturePhp80/multiple_union_types.php.inc b/...ClassMethod/ReturnTypeFromStrictTypedCallRector/FixturePhp80/multiple_union_types.php.inc
diff --git a/...ctor/ClassMethod/ReturnTypeFromStrictTypedCallRector/FixturePhp80/pathinfo_return.php.inc b/...ctor/ClassMethod/ReturnTypeFromStrictTypedCallRector/FixturePhp80/pathinfo_return.php.inc
@@ -36,7 +36,7 @@ final class PathInfoReturn
      *
      * @psalm-assert-if-true =non-empty-string $filename
      */
-    public static function extension($filename): string|array
+    public static function extension($filename): array|string
     {
         return pathinfo($filename, PATHINFO_EXTENSION);
     }

diff --git a/rules/TypeDeclaration/PHPStan/ObjectTypeSpecifier.php b/rules/TypeDeclaration/PHPStan/ObjectTypeSpecifier.php
@@ -40,6 +40,7 @@ public function narrowToFullyQualifiedOrAliasedObjectType(
         ?Scope $scope = null,
     ): FullyQualifiedObjectType | AliasedObjectType | ShortenedGenericObjectType | ShortenedObjectType | NonExistingObjectType | UnionType | MixedType {
         $filePath = $node->getAttribute(AttributeKey::FILE_PATH);
+
         // $useImportsScope = $this->useImportsResolver->resolve();
         $useImportScope = $this->useImportsScopeResolver->resolve($filePath);
 

diff --git a/rules/TypeDeclaration/TypeAnalyzer/ReturnStrictTypeAnalyzer.php b/rules/TypeDeclaration/TypeAnalyzer/ReturnStrictTypeAnalyzer.php
@@ -96,19 +96,10 @@ public function collectStrictReturnTypes(array $returns, Scope $scope): array
     public function resolveMethodCallReturnNode(MethodCall | StaticCall | FuncCall $call): ?Node
     {
         $returnType = $this->resolveMethodCallReturnType($call);
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 8e47df14f2 (add union type test fixture for ReturnTypeFromStrictTypedCallRector)
         if (! $returnType instanceof Type) {
             return null;
         }
 
-<<<<<<< HEAD
-=======
->>>>>>> c1a7c8b301 (traverse with file path, improve CleanupUnneededNullsafeOperatorRector to use type directly isntead of node juggling)
-=======
->>>>>>> 8e47df14f2 (add union type test fixture for ReturnTypeFromStrictTypedCallRector)
         return $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($returnType, TypeKind::RETURN);
     }
 

diff --git a/tests/BetterPhpDocParser/PhpDocInfo/PhpDocInfo/PhpDocInfoTest.php b/tests/BetterPhpDocParser/PhpDocInfo/PhpDocInfo/PhpDocInfoTest.php
@@ -11,6 +11,7 @@
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
 use Rector\BetterPhpDocParser\Printer\PhpDocInfoPrinter;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\DocBlockTagReplacer;
 use Rector\NodeTypeResolver\Reflection\BetterReflection\SourceLocatorProvider\DynamicSourceLocatorProvider;
 use Rector\StaticTypeMapper\ValueObject\Type\NonExistingObjectType;
@@ -96,6 +97,7 @@ private function createPhpDocInfoFromFile(string $path): ?PhpDocInfo
 
         $nop = new Nop();
         $nop->setDocComment(new Doc($phpDocContent));
+        $nop->setAttribute(AttributeKey::FILE_PATH, $path);
 
         return $phpDocInfoFactory->createFromNode($nop);
     }