Fixes #1719 - treat literal string values in a token as ... literal s…

…tring values
phingofficial · Aug 9, 2023 · e6702dc · e6702dc
1 parent 9f6594b
commit e6702dc
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 33 deletions.
diff --git a/src/Phing/Filter/Token.php b/src/Phing/Filter/Token.php
@@ -54,18 +54,9 @@ public function setKey($key)
      *
      * @param string $value The value for this token. Must not be <code>null</code>.
      */
-    public function setValue($value)
+    public function setValue(string $value)
     {
-        // special case for bool values
-        if (is_bool($value)) {
-            if ($value) {
-                $this->value = 'true';
-            } else {
-                $this->value = 'false';
-            }
-        } else {
-            $this->value = (string) $value;
-        }
+        $this->value = $value;
     }
 
     /**

diff --git a/...st/Regression/ReplaceTokenBooleanTest.php → ...s/Phing/Test/Filter/ReplaceTokensTest.php b/...st/Regression/ReplaceTokenBooleanTest.php → ...s/Phing/Test/Filter/ReplaceTokensTest.php
@@ -18,7 +18,7 @@
  * <http://phing.info>.
  */
 
-namespace Phing\Test\Regression;
+namespace Phing\Test\Filter;
 
 use Phing\Test\Support\BuildFileTest;
 
@@ -28,16 +28,27 @@
  *
  * @internal
  */
-class ReplaceTokenBooleanTest extends BuildFileTest
+class ReplaceTokensTest extends BuildFileTest
 {
     public function setUp(): void
     {
-        $this->configureProject(PHING_TEST_BASE . '/etc/regression/376/build.xml');
+        $this->configureProject(PHING_TEST_BASE . '/etc/filters/replacetokens.xml');
     }
 
-    public function testCustomTask(): void
+    public function tearDown(): void
     {
-        $this->executeTarget('main');
+        $this->executeTarget('cleanup');
+    }
+
+    public function testLiteralBooleans(): void
+    {
+        $this->executeTarget('testLiteralBooleans');
         $this->assertInLogs('Replaced "@TOKEN_KEY_TRUE@" with "true"');
     }
+
+    public function testLiteralsThatShouldNotBeConvertedToBooleans(): void
+    {
+        $this->executeTarget('testLiteralsThatShouldNotBeConvertedToBooleans');
+        $this->assertInLogs('Replaced "@TOKEN_KEY_TRUE@" with "1"');
+    }
 }
diff --git a/tests/etc/regression/376/testfile → ...s/etc/filters/expected/replacetokens.test b/tests/etc/regression/376/testfile → ...s/etc/filters/expected/replacetokens.test
diff --git a/tests/etc/filters/replacetokens.xml b/tests/etc/filters/replacetokens.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+
+<project name="ReplaceTokens" default="cleanup">
+    <target name="init">
+        <mkdir dir="result" />
+    </target>
+    <target name="cleanup">
+        <delete dir="result"/>
+    </target>
+    <target name="testLiteralBooleans">
+        <copy file="expected/replacetokens.test" todir="result" overwrite="true">
+            <filterchain>
+                <replacetokens>
+                    <token key="TOKEN_KEY_TRUE" value="true"/>
+                    <token key="TOKEN_KEY_FALSE" value="false"/>
+                </replacetokens>
+            </filterchain>
+        </copy>
+    </target>
+    <target name="testLiteralsThatShouldNotBeConvertedToBooleans">
+        <copy file="expected/replacetokens.test" todir="result" overwrite="true">
+            <filterchain>
+                <replacetokens>
+                    <token key="TOKEN_KEY_TRUE" value="1"/>
+                    <token key="TOKEN_KEY_FALSE" value="0"/>
+                </replacetokens>
+            </filterchain>
+        </copy>
+    </target>
+</project>
diff --git a/tests/etc/regression/376/build.xml b/tests/etc/regression/376/build.xml