Re-use MovedFile (#628)

rectorphp · Aug 9, 2021 · fa8e3bd · fa8e3bd
1 parent c913346
commit fa8e3bd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 30 deletions.
diff --git a/packages/Testing/PHPUnit/Behavior/MovingFilesTrait.php b/packages/Testing/PHPUnit/Behavior/MovingFilesTrait.php
@@ -78,13 +78,19 @@ protected function assertFilesWereAdded(array $expectedAddedFileWithContents): v
     private function resolveAddedFilePathsWithContents(): array
     {
         $addedFilePathsWithContents = $this->removedAndAddedFilesCollector->getAddedFilesWithContent();
+        $nodesWithFileDestinationPrinter = $this->getService(NodesWithFileDestinationPrinter::class);
+
+        $movedFiles = $this->removedAndAddedFilesCollector->getMovedFiles();
+        foreach ($movedFiles as $movedFile) {
+            $fileContent = $nodesWithFileDestinationPrinter->printNodesWithFileDestination($movedFile);
+            $addedFilePathsWithContents[] = new AddedFileWithContent($movedFile->getNewFilePath(), $fileContent);
+        }
 
         $addedFilesWithNodes = $this->removedAndAddedFilesCollector->getAddedFilesWithNodes();
         if ($addedFilesWithNodes === []) {
             return $addedFilePathsWithContents;
         }
 
-        $nodesWithFileDestinationPrinter = $this->getService(NodesWithFileDestinationPrinter::class);
         foreach ($addedFilesWithNodes as $addedFileWithNode) {
             $fileContent = $nodesWithFileDestinationPrinter->printNodesWithFileDestination($addedFileWithNode);
             $addedFilePathsWithContents[] = new AddedFileWithContent($addedFileWithNode->getFilePath(), $fileContent);

diff --git a/...sLike/UpdateFileNameByClassNameFileSystemRector/Fixture/skip_different_class_name.php.inc b/...sLike/UpdateFileNameByClassNameFileSystemRector/Fixture/skip_different_class_name.php.inc
@@ -1,10 +1,8 @@
 <?php
 
 declare(strict_types=1);
-
 namespace Rector\Tests\Restoration\Rector\ClassLike\UpdateFileNameByClassNameFileSystemRector\Fixture;
 
 final class SkipDifferentClassName
 {
-
 }
diff --git a/rules/PhpSpecToPHPUnit/PHPUnitTypeDeclarationDecorator.php b/rules/PhpSpecToPHPUnit/PHPUnitTypeDeclarationDecorator.php
@@ -4,21 +4,18 @@
 
 namespace Rector\PhpSpecToPHPUnit;
 
-use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt\ClassMethod;
-use Rector\Core\Reflection\ReflectionResolver;
+use Rector\Core\PhpParser\AstResolver;
 use Rector\Core\ValueObject\MethodName;
 use Rector\Testing\PHPUnit\StaticPHPUnitEnvironment;
-use ReflectionMethod;
-use ReflectionNamedType;
 
 /**
  * Decorate setUp() and tearDown() with "void" when local TestClass class uses them
  */
 final class PHPUnitTypeDeclarationDecorator
 {
     public function __construct(
-        private ReflectionResolver $reflectionResolver
+        private AstResolver $astResolver
     ) {
     }
 
@@ -29,24 +26,11 @@ public function decorate(ClassMethod $classMethod): void
             return;
         }
 
-        $reflectionMethod = $this->reflectionResolver->resolveNativeClassMethodReflection(
-            'PHPUnit\Framework\TestCase',
-            MethodName::SET_UP
-        );
-
-        if (! $reflectionMethod instanceof ReflectionMethod) {
+        $setUpClassMethod = $this->astResolver->resolveClassMethod('PHPUnit\Framework\TestCase', MethodName::SET_UP);
+        if (! $setUpClassMethod instanceof ClassMethod) {
             return;
         }
 
-        if (! $reflectionMethod->hasReturnType()) {
-            return;
-        }
-
-        $returnType = $reflectionMethod->getReturnType();
-        $returnTypeName = $returnType instanceof ReflectionNamedType
-            ? $returnType->getName()
-            : (string) $returnType;
-
-        $classMethod->returnType = new Identifier($returnTypeName);
+        $classMethod->returnType = $setUpClassMethod->returnType;
     }
 }
diff --git a/rules/Restoration/Rector/ClassLike/UpdateFileNameByClassNameFileSystemRector.php b/rules/Restoration/Rector/ClassLike/UpdateFileNameByClassNameFileSystemRector.php
@@ -7,7 +7,8 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassLike;
 use Rector\Core\Rector\AbstractRector;
-use Rector\FileSystemRector\ValueObject\AddedFileWithContent;
+use Rector\Core\ValueObject\Application\File;
+use Rector\NodeTypeResolver\Node\AttributeKey;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
 
@@ -64,13 +65,14 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        $file = $node->getAttribute(AttributeKey::FILE);
+        if (! $file instanceof File) {
+            return null;
+        }
+
         // no match → rename file
         $newFileLocation = $smartFileInfo->getPath() . DIRECTORY_SEPARATOR . $classShortName . '.php';
-
-        $addedFileWithContent = new AddedFileWithContent($newFileLocation, $smartFileInfo->getContents());
-        $this->removedAndAddedFilesCollector->removeFile($smartFileInfo);
-
-        $this->removedAndAddedFilesCollector->addAddedFile($addedFileWithContent);
+        $this->removedAndAddedFilesCollector->addMovedFile($file, $newFileLocation);
 
         return null;
     }