Merge branch '1.x' into 2.x

* 1.x: [Feature] Add options expansion to Add Lines Configuration
symfony · Feb 5, 2024 · bec213c · bec213c
2 parents 6b44ac7 + 6b46a00
commit bec213c
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/src/Configurator/AddLinesConfigurator.php b/src/Configurator/AddLinesConfigurator.php
@@ -97,7 +97,7 @@ public function executeConfigure(Recipe $recipe, $config): void
             }
             $content = $patch['content'];
 
-            $file = $this->path->concatenate([$this->options->get('root-dir'), $patch['file']]);
+            $file = $this->path->concatenate([$this->options->get('root-dir'), $this->options->expandTargetDir($patch['file'])]);
             $warnIfMissing = isset($patch['warn_if_missing']) && $patch['warn_if_missing'];
             if (!is_file($file)) {
                 $this->write([
@@ -147,7 +147,7 @@ public function executeUnconfigure(Recipe $recipe, $config): void
             // Ignore "requires": the target packages may have just become uninstalled.
             // Checking for a "content" match is enough.
 
-            $file = $this->path->concatenate([$this->options->get('root-dir'), $patch['file']]);
+            $file = $this->path->concatenate([$this->options->get('root-dir'), $this->options->expandTargetDir($patch['file'])]);
             if (!is_file($file)) {
                 continue;
             }

diff --git a/tests/Configurator/AddLinesConfiguratorTest.php b/tests/Configurator/AddLinesConfiguratorTest.php
@@ -67,6 +67,26 @@ public function testLinesAddedToTopOfFile()
             $actualContents);
     }
 
+    public function testExpandTargetDirWhenConfiguring()
+    {
+        $this->saveFile('config/file.txt', 'FirstLine');
+
+        $this->runConfigure([
+            [
+                'file' => '%CONFIG_DIR%/file.txt',
+                'position' => 'top',
+                'content' => 'NewFirstLine',
+            ],
+        ]);
+        $actualContents = $this->readFile('config/file.txt');
+        $this->assertSame(<<<EOF
+NewFirstLine
+FirstLine
+EOF
+            ,
+            $actualContents);
+    }
+
     public function testLinesAddedToBottomOfFile()
     {
         $this->saveFile('assets/app.js', <<<EOF
@@ -318,6 +338,28 @@ public function testUnconfigure(string $originalContents, string $value, string
         $this->assertSame($expectedContents, $actualContents);
     }
 
+    public function testExpandTargetDirWhenUnconfiguring()
+    {
+        $this->saveFile('config/file.txt',
+            <<<EOF
+Line1
+Line2
+EOF
+        );
+
+        $this->runUnconfigure([
+            [
+                'file' => '%CONFIG_DIR%/file.txt',
+                'content' => 'Line1',
+            ],
+        ]);
+        $actualContents = $this->readFile('config/file.txt');
+        $this->assertSame(<<<EOF
+Line2
+EOF
+            , $actualContents);
+    }
+
     public function getUnconfigureTests()
     {
         yield 'found_middle' => [