Merge pull request #397 from CPS-IT/fix/target-template-suffix

[BUGFIX] Correctly remove twig file extension with target file given
CPS-IT · Nov 29, 2023 · 785bef3 · 785bef3
2 parents 8ec1064 + 7a513b3
commit 785bef3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Builder/Writer/TemplateWriter.php b/src/Builder/Writer/TemplateWriter.php
@@ -55,7 +55,7 @@ public function write(
         $renderResult = $renderer->render($instructions, $file->getFilename(), $variables);
         $targetFile = Helper\FilesystemHelper::createFileObject(
             $instructions->getTemporaryDirectory(),
-            $targetFile ?? (string) preg_replace('/\.twig$/', '', $file->getRelativePathname()),
+            (string) preg_replace('/\.twig$/', '', $targetFile ?? $file->getRelativePathname()),
         );
 
         $this->filesystem->dumpFile($targetFile->getPathname(), $renderResult);

diff --git a/tests/src/Builder/Writer/TemplateWriterTest.php b/tests/src/Builder/Writer/TemplateWriterTest.php
@@ -95,7 +95,7 @@ public function writeWritesRenderedTemplateFileToGivenTargetFile(): void
         $file = new Finder\SplFileInfo($templateFile, dirname($templateFile), basename($templateFile));
 
         $expected = $instructions->getTemporaryDirectory().'/overrides/dump.json';
-        $actual = $this->subject->write($instructions, $file, 'overrides/dump.json', ['bar' => 'bar']);
+        $actual = $this->subject->write($instructions, $file, 'overrides/dump.json.twig', ['bar' => 'bar']);
 
         self::assertSame($expected, $actual->getPathname());
         self::assertFileExists($expected);