Added viriable replacement to DeleteFilesAndFolders so creating and deleting files and folders works the same way

Author: bastianschwarz

README.md

@@ -69,9 +69,7 @@ return call_user_func(static function() {
           $variables 
       ),
       new CreateFolders($variableReplacer, $filesystem, [__DIR__ . '/../src', __DIR__ . '/../test'], $variables),
-      new DeleteFilesAndFolders($filesystem, [
-        __DIR__      
-      ]),
+      new DeleteFilesAndFolders($variableReplacer, $filesystem, [__DIR__], $variables),
     )
   ))->run();
 });

src/steps/CreateFolders.php

@@ -43,8 +43,6 @@ public function __construct(public iVariableReplacer $variableReplacer, public F
    * @throws IOException
    */
   public function run() : void {
-    foreach($this->folders as $folder) {
-      $this->filesystem->mkdir($this->variableReplacer->replace($folder, $this->variables));
-    }
+    $this->filesystem->mkdir(array_map(fn(string $folder) => $this->variableReplacer->replace($folder, $this->variables), $this->folders));
   }
 }

src/steps/DeleteFilesAndFolders.php

@@ -18,6 +18,7 @@
 
 namespace de\codenamephp\installer\steps;
 
+use de\codenamephp\installer\templateCopy\variableReplacer\iVariableReplacer;
 use Symfony\Component\Filesystem\Exception\IOException;
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -27,17 +28,19 @@
 final class DeleteFilesAndFolders implements iStep {
 
   /**
-   * @param Filesystem $filesystem
-   * @param string[] $filesAndFoldersToDelete
+   * @param iVariableReplacer $variableReplacer Used to replace variables in the paths of the files and folders
+   * @param Filesystem $filesystem Used to delete the files and folders
+   * @param array<string> $filesAndFoldersToDelete The absolute paths of the files and folders to be deleted
+   * @param array<string, string> $variables Used in variable replacement in the folder paths of the files and folders
    */
-  public function __construct(public Filesystem $filesystem, public array $filesAndFoldersToDelete) { }
+  public function __construct(public iVariableReplacer $variableReplacer, public Filesystem $filesystem, public array $filesAndFoldersToDelete, public array $variables) { }
 
   /**
    *
    * @inheritDoc
    * @throws IOException
    */
   public function run() : void {
-    $this->filesystem->remove($this->filesAndFoldersToDelete);
+    $this->filesystem->remove(array_map(fn(string $path) => $this->variableReplacer->replace($path, $this->variables), $this->filesAndFoldersToDelete));
   }
 }

test/steps/CreateFoldersTest.php

@@ -50,10 +50,7 @@ public function testRun() : void {
         ->willReturnOnConsecutiveCalls('replaced1', 'replaced2', 'replaced3');
 
     $this->sut->filesystem = $this->createMock(Filesystem::class);
-    $this->sut->filesystem
-        ->expects(self::exactly(3))
-        ->method('mkdir')
-        ->withConsecutive(['replaced1'], ['replaced2'], ['replaced3']);
+    $this->sut->filesystem->expects(self::once())->method('mkdir')->with(['replaced1', 'replaced2', 'replaced3']);
 
     $this->sut->run();
   }

test/steps/DeleteFilesAndFoldersTest.php

@@ -19,6 +19,7 @@
 namespace de\codenamephp\installer\test\steps;
 
 use de\codenamephp\installer\steps\DeleteFilesAndFolders;
+use de\codenamephp\installer\templateCopy\variableReplacer\iVariableReplacer;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -27,17 +28,30 @@ class DeleteFilesAndFoldersTest extends TestCase {
   private DeleteFilesAndFolders $sut;
 
   protected function setUp() : void {
+    $variableReplacer = $this->createMock(iVariableReplacer::class);
     $filesystem = $this->createMock(Filesystem::class);
 
-    $this->sut = new DeleteFilesAndFolders($filesystem, []);
+    $this->sut = new DeleteFilesAndFolders($variableReplacer, $filesystem, [], []);
   }
 
   public function testRun() : void {
     $this->sut->filesAndFoldersToDelete = ['some', 'files'];
-
-    $filesystem = $this->createMock(Filesystem::class);
-    $filesystem->expects(self::once())->method('remove')->with($this->sut->filesAndFoldersToDelete);
-    $this->sut->filesystem = $filesystem;
+    $this->sut->variables = ['some', 'vars'];
+    $this->sut->filesAndFoldersToDelete = ['folder1', 'file1', 'file2'];
+
+    $this->sut->variableReplacer = $this->createMock(iVariableReplacer::class);
+    $this->sut->variableReplacer
+        ->expects(self::exactly(3))
+        ->method('replace')
+        ->withConsecutive(
+            [$this->sut->filesAndFoldersToDelete[0], $this->sut->variables],
+            [$this->sut->filesAndFoldersToDelete[1], $this->sut->variables],
+            [$this->sut->filesAndFoldersToDelete[2], $this->sut->variables],
+        )
+        ->willReturnOnConsecutiveCalls('replaced1', 'replaced2', 'replaced3');
+
+    $this->sut->filesystem = $this->createMock(Filesystem::class);
+    $this->sut->filesystem->expects(self::once())->method('remove')->with(['replaced1', 'replaced2', 'replaced3']);
 
     $this->sut->run();
   }