[PSR4] Fix deleting file that matches class name (#163)

* Add failing test fixture for MultipleClassFileToPsr4ClassesRector * Fix deleting file that matches class name
rectorphp · Jun 7, 2021 · 0c9a1f8 · 0c9a1f8
1 parent 84c80e4
commit 0c9a1f8
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 4 deletions.
diff --git a/...amespace_/MultipleClassFileToPsr4ClassesRector/Expected/ClassMatchesFilenameException.php b/...amespace_/MultipleClassFileToPsr4ClassesRector/Expected/ClassMatchesFilenameException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Rector\Tests\PSR4\Rector\Namespace_\MultipleClassFileToPsr4ClassesRector\Fixture;
+
+class ClassMatchesFilenameException
+{
+}
diff --git a/...ctor/Namespace_/MultipleClassFileToPsr4ClassesRector/Fixture/ClassMatchesFilename.php.inc b/...ctor/Namespace_/MultipleClassFileToPsr4ClassesRector/Fixture/ClassMatchesFilename.php.inc
@@ -0,0 +1,23 @@
+<?php
+
+namespace Rector\Tests\PSR4\Rector\Namespace_\MultipleClassFileToPsr4ClassesRector\Fixture;
+
+class ClassMatchesFilename
+{
+}
+
+class ClassMatchesFilenameException
+{
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\PSR4\Rector\Namespace_\MultipleClassFileToPsr4ClassesRector\Fixture;
+
+class ClassMatchesFilename
+{
+}
+
+?>
diff --git a/...espace_/MultipleClassFileToPsr4ClassesRector/MultipleClassFileToPsr4ClassesRectorTest.php b/...espace_/MultipleClassFileToPsr4ClassesRector/MultipleClassFileToPsr4ClassesRectorTest.php
@@ -7,6 +7,7 @@
 use Iterator;
 use Rector\FileSystemRector\ValueObject\AddedFileWithContent;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\EasyTesting\StaticFixtureSplitter;
 use Symplify\SmartFileSystem\SmartFileInfo;
 use Symplify\SmartFileSystem\SmartFileSystem;
 
@@ -16,13 +17,24 @@ final class MultipleClassFileToPsr4ClassesRectorTest extends AbstractRectorTestC
      * @param AddedFileWithContent[] $expectedFilePathsWithContents
      * @dataProvider provideData()
      */
-    public function test(SmartFileInfo $originalFileInfo, array $expectedFilePathsWithContents): void
-    {
+    public function test(
+        SmartFileInfo $originalFileInfo,
+        array $expectedFilePathsWithContents,
+        bool $expectedOriginalFileWasRemoved = true
+    ): void {
         $this->doTestFileInfo($originalFileInfo);
 
         $this->assertCount($this->removedAndAddedFilesCollector->getAddedFileCount(), $expectedFilePathsWithContents);
 
         $this->assertFilesWereAdded($expectedFilePathsWithContents);
+
+        $inputFileInfoAndExpectedFileInfo = StaticFixtureSplitter::splitFileInfoToLocalInputAndExpectedFileInfos(
+            $originalFileInfo
+        );
+        self::assertSame(
+            $expectedOriginalFileWasRemoved,
+            $this->removedAndAddedFilesCollector->isFileRemoved($inputFileInfoAndExpectedFileInfo->getInputFileInfo())
+        );
     }
 
     /**
@@ -74,6 +86,15 @@ public function provideData(): Iterator
         ];
 
         yield [new SmartFileInfo(__DIR__ . '/Fixture/class_trait_and_interface.php.inc'), $filePathsWithContents];
+
+        $filePathsWithContents = [
+            new AddedFileWithContent(
+                $this->getFixtureTempDirectory() . '/ClassMatchesFilenameException.php',
+                $smartFileSystem->readFile(__DIR__ . '/Expected/ClassMatchesFilenameException.php')
+            ),
+        ];
+
+        yield [new SmartFileInfo(__DIR__ . '/Fixture/ClassMatchesFilename.php.inc'), $filePathsWithContents, false];
     }
 
     public function provideConfigFilePath(): string

diff --git a/rules/PSR4/Rector/Namespace_/MultipleClassFileToPsr4ClassesRector.php b/rules/PSR4/Rector/Namespace_/MultipleClassFileToPsr4ClassesRector.php
@@ -183,8 +183,6 @@ private function printNewNodes(ClassLike $classLike, Node $mainNode): void
 
         $fileDestination = $this->createClassLikeFileDestination($classLike, $smartFileInfo);
 
-        $this->removedAndAddedFilesCollector->removeFile($smartFileInfo);
-
         $addedFileWithNodes = new AddedFileWithNodes($fileDestination, $nodesToPrint);
         $this->removedAndAddedFilesCollector->addAddedFile($addedFileWithNodes);
     }