From 4de09d3d21f98bc6e740157ce93f24ec6a3fe56a Mon Sep 17 00:00:00 2001
From: jawira <dev@tugal.be>
Date: Wed, 23 Oct 2019 22:22:05 +0200
Subject: [PATCH 1/9] ComposerTask: update code & doc #1163

---
 classes/phing/tasks/ext/ComposerTask.php      |  7 +-
 .../en/source/appendixes/optionaltasks.xml    | 69 +++++++++++--------
 etc/phing-grammar.rng                         | 34 +++++----
 3 files changed, 66 insertions(+), 44 deletions(-)

diff --git a/classes/phing/tasks/ext/ComposerTask.php b/classes/phing/tasks/ext/ComposerTask.php
index 7483b07622..2c86b1a86c 100644
--- a/classes/phing/tasks/ext/ComposerTask.php
+++ b/classes/phing/tasks/ext/ComposerTask.php
@@ -19,6 +19,7 @@
 
 /**
  * Composer Task
+ *
  * Run composer straight from phing
  *
  * @author  nuno costa <nuno@francodacosta.com>
@@ -166,8 +167,12 @@ public function createArg()
     private function prepareCommandLine()
     {
         $this->commandLine->setExecutable($this->getPhp());
+        $command = $this->getCommand();
+        if (empty($command)) {
+            throw new BuildException('"command" attribute is required');
+        }
         //We are un-shifting arguments to the beginning of the command line because arguments should be at the end
-        $this->commandLine->createArgument(true)->setValue($this->getCommand());
+        $this->commandLine->createArgument(true)->setValue($command);
         $this->commandLine->createArgument(true)->setValue($this->getComposer());
         $commandLine = (string) $this->commandLine;
         //Creating new Commandline instance. It allows to handle subsequent calls correctly
diff --git a/docs/guide/en/source/appendixes/optionaltasks.xml b/docs/guide/en/source/appendixes/optionaltasks.xml
index 9fad68a5a4..ce062b46e4 100644
--- a/docs/guide/en/source/appendixes/optionaltasks.xml
+++ b/docs/guide/en/source/appendixes/optionaltasks.xml
@@ -274,11 +274,12 @@
     </sect1>
     <sect1 role="taskdef" xml:id="ComposerTask">
         <title>ComposerTask</title>
-        <para>
-            The ComposerTask runs the Composer tool (<link xlink:href="http://getcomposer.org" role="extern">http://getcomposer.org</link>)
-            directly from Phing.
-        </para>
-        <table>
+      <para>
+        The <literal>ComposerTask</literal> runs the Composer tool
+        (<link xlink:href="http://getcomposer.org" role="extern">http://getcomposer.org</link>)
+        directly from Phing.
+      </para>
+      <table>
             <title>Attributes</title>
             <tgroup cols="5">
                 <colspec colname="name" colnum="1" colwidth="1.5*"/>
@@ -296,28 +297,31 @@
                     </row>
                 </thead>
                 <tbody>
-                    <row>
-                        <entry><literal>php</literal></entry>
-                        <entry><literal role="type">String</literal></entry>
-                        <entry>Path to the PHP interpreter</entry>
-                        <entry>Defaults to the <literal>${php.interpreter}</literal> property which is
-                            the interpreter used to execute phing itself.</entry>
-                        <entry>No</entry>
-                    </row>
-                    <row>
-                        <entry><literal>composer</literal></entry>
-                        <entry><literal role="type">String</literal></entry>
-                        <entry>Path to Composer.</entry>
-                        <entry>composer.phar</entry>
-                        <entry>No</entry>
-                    </row>
-                    <row>
-                        <entry><literal>command</literal></entry>
-                        <entry><literal role="type">String</literal></entry>
-                        <entry>The Composer command to execute.</entry>
-                        <entry>n/a</entry>
-                        <entry>No</entry>
-                    </row>
+                  <row>
+                    <entry><literal>command</literal></entry>
+                    <entry><literal role="type">String</literal></entry>
+                    <entry>The Composer command to execute.</entry>
+                    <entry>n/a</entry>
+                    <entry>Yes</entry>
+                  </row>
+                  <row>
+                    <entry><literal>composer</literal></entry>
+                    <entry><literal role="type">String</literal></entry>
+                    <entry>Path to Composer.</entry>
+                    <entry><literal>composer.phar</literal>, if not found it tries to use <literal>composer</literal> executable
+                      from your system.
+                    </entry>
+                    <entry>No</entry>
+                  </row>
+                  <row>
+                    <entry><literal>php</literal></entry>
+                    <entry><literal role="type">String</literal></entry>
+                    <entry>Path to the PHP interpreter</entry>
+                    <entry>Defaults to the <literal>${php.interpreter}</literal> property which is the interpreter used
+                      to execute phing itself.
+                    </entry>
+                    <entry>No</entry>
+                  </row>
                 </tbody>
             </tgroup>
         </table>
@@ -383,6 +387,13 @@
                 </listitem>
             </itemizedlist>
         </sect2>
+        <sect2>
+          <title>Example</title>
+          <programlisting language="xml">&lt;composer command=&quot;install&quot;&gt;
+  &lt;arg value=&quot;--no-dev&quot;/&gt;
+  &lt;arg value=&quot;--no-interaction&quot;/&gt;
+&lt;/composer&gt;</programlisting>
+        </sect2>
     </sect1>
     <sect1 role="taskdef" xml:id="CoverageMergerTask">
         <title>CoverageMergerTask</title>
@@ -4123,7 +4134,7 @@ Note that you can omit both startpoint and track attributes in this case
                         <entry>html or text</entry>
                         <entry>text</entry>
                         <entry>No</entry>
-                    </row>			
+                    </row>
                     <row>
                         <entry><literal>domain</literal></entry>
                         <entry><literal role="type">String</literal></entry>
@@ -4627,7 +4638,7 @@ Note that you can omit both startpoint and track attributes in this case
     <sect1 role="taskdef" xml:id="IniFileTask">
         <title>IniFileTask</title>
         <para>The <literal>IniFileTask</literal> is inspired by the <link
-        xlink:href="http://ant-contrib.sourceforge.net/tasks/tasks/inifile.html" role="extern">Ant-Contrib IniFile</link> 
+        xlink:href="http://ant-contrib.sourceforge.net/tasks/tasks/inifile.html" role="extern">Ant-Contrib IniFile</link>
         and can be used to build and edit .ini files. Unlike the Ant equivalent, it can also read values from different
         sections of an .ini file and set the retrieved values to specified properties.</para>
         <table>
diff --git a/etc/phing-grammar.rng b/etc/phing-grammar.rng
index cb4db4c234..0772487088 100644
--- a/etc/phing-grammar.rng
+++ b/etc/phing-grammar.rng
@@ -2591,20 +2591,26 @@
         </element>
     </define>
 
-    <define name="composer">
-        <element name="composer">
-            <interleave>
-                <optional>
-                    <attribute name="php"/>
-                    <attribute name="composer"/>
-                    <attribute name="command"/>
-                </optional>
-                <zeroOrMore>
-                    <ref name="arg"/>
-                </zeroOrMore>
-            </interleave>
-        </element>
-    </define>
+  <define name="composer">
+    <element name="composer">
+      <interleave>
+        <attribute name="composer">
+          <data type="string"/>
+        </attribute>
+        <optional>
+          <attribute name="command">
+            <data type="string"/>
+          </attribute>
+          <attribute name="php">
+            <data type="string"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="arg"/>
+        </zeroOrMore>
+      </interleave>
+    </element>
+  </define>
 
     <!--
         =========================================

From 85dc26386c009dd7d102c6cc96b7046a8497cca1 Mon Sep 17 00:00:00 2001
From: jawira <dev@tugal.be>
Date: Sun, 16 May 2021 09:37:06 +0200
Subject: [PATCH 2/9] Add tests for startsWith

---
 tests/Phing/Util/StringHelperTest.php | 29 +++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tests/Phing/Util/StringHelperTest.php b/tests/Phing/Util/StringHelperTest.php
index e1db83e71b..fc9c21cb9b 100644
--- a/tests/Phing/Util/StringHelperTest.php
+++ b/tests/Phing/Util/StringHelperTest.php
@@ -135,4 +135,33 @@ public function isBooleanProvider()
             [null, false],
         ];
     }
+
+    /**
+     * @dataProvider startsWithProvider
+     * @covers       \Phing\Util\StringHelper::startsWith
+     */
+    public function testStartsWith($needle = 'f', $haystack = 'foo', $expected = true)
+    {
+        $result = StringHelper::startsWith($needle, $haystack);
+        $this->assertSame($expected, $result);
+    }
+
+    public function startsWithProvider()
+    {
+        return [
+            // True
+            ['F', 'FooBarBaz', true],
+            ['Foo', 'FooBarBaz', true],
+            ['FooBarBaz', 'FooBarBaz', true],
+            ['', 'FooBarBaz', true],
+            ['', "\x00", true],
+            ["\x00", "\x00", true],
+            ["\x00", "\x00a", true],
+            ["a\x00b", "a\x00bc", true],
+            // False
+            ['Foo', 'BarBaz', false],
+            ['foo', 'FooBarBaz', false],
+            ['Foo', 'fooBarBaz', false],
+        ];
+    }
 }

From d7f2886184b2bc6facdd518b72fb94e4f2696a54 Mon Sep 17 00:00:00 2001
From: jawira <dev@tugal.be>
Date: Sun, 16 May 2021 13:09:17 +0200
Subject: [PATCH 3/9] Add tests for endsWith

---
 tests/Phing/Util/StringHelperTest.php | 34 ++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/tests/Phing/Util/StringHelperTest.php b/tests/Phing/Util/StringHelperTest.php
index fc9c21cb9b..cdc6d76474 100644
--- a/tests/Phing/Util/StringHelperTest.php
+++ b/tests/Phing/Util/StringHelperTest.php
@@ -140,7 +140,7 @@ public function isBooleanProvider()
      * @dataProvider startsWithProvider
      * @covers       \Phing\Util\StringHelper::startsWith
      */
-    public function testStartsWith($needle = 'f', $haystack = 'foo', $expected = true)
+    public function testStartsWith($needle, $haystack, $expected)
     {
         $result = StringHelper::startsWith($needle, $haystack);
         $this->assertSame($expected, $result);
@@ -162,6 +162,38 @@ public function startsWithProvider()
             ['Foo', 'BarBaz', false],
             ['foo', 'FooBarBaz', false],
             ['Foo', 'fooBarBaz', false],
+            ['Foo', '', false],
+        ];
+    }
+
+    /**
+     * @dataProvider endsWithProvider
+     * @covers       \Phing\Util\StringHelper::endsWith
+     */
+    public function testEndsWith($needle = 'o', $haystack = 'foo', $expected = true)
+    {
+        $result = StringHelper::endsWith($needle, $haystack);
+        $this->assertSame($expected, $result);
+    }
+
+
+    public function endsWithProvider()
+    {
+        return [
+            // True
+            ['z', 'FooBarBaz', true],
+            ['Baz', 'FooBarBaz', true],
+            ['FooBarBaz', 'FooBarBaz', true],
+            ['', 'FooBarBaz', true],
+            ['', "\x00", true],
+            ["\x00", "\x00", true],
+            ["\x00", "a\x00", true],
+            ["b\x00c", "ab\x00c", true],
+            // False
+            ['Baz', 'FooBar', false],
+            ['baz', 'FooBarBaz', false],
+            ['Baz', 'foobarbaz', false],
+            ['Baz', '', false],
         ];
     }
 }

From 7b2e1965766eb725675a47d4b48d82973391dbc8 Mon Sep 17 00:00:00 2001
From: jawira <dev@tugal.be>
Date: Sun, 16 May 2021 13:44:07 +0200
Subject: [PATCH 4/9] Add tests for substring

---
 tests/Phing/Util/StringHelperTest.php | 46 +++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/tests/Phing/Util/StringHelperTest.php b/tests/Phing/Util/StringHelperTest.php
index cdc6d76474..418fa5f92b 100644
--- a/tests/Phing/Util/StringHelperTest.php
+++ b/tests/Phing/Util/StringHelperTest.php
@@ -196,4 +196,50 @@ public function endsWithProvider()
             ['Baz', '', false],
         ];
     }
+
+    /**
+     * @covers       \Phing\Util\StringHelper::substring
+     * @dataProvider substringProvider
+     */
+    public function testSubstring($string, $start, $end, $expected)
+    {
+        $result = StringHelper::substring($string, $start, $end);
+        $this->assertSame($expected, $result);
+    }
+
+    public function substringProvider()
+    {
+        return [
+            ['FooBarBaz', 0, 1, 'Fo'],
+            ['FooBarBaz', 2, 4, 'oBa'],
+            ['FooBarBaz', 0, 0, 'F'],
+            ['FooBarBaz', 3, 3, 'B'],
+            ['FooBarBaz', 0, 8, 'FooBarBaz'],
+            ['FooBarBaz', 0, -1, 'FooBarBaz'],
+            ['FooBarBaz', 5, 8, 'rBaz'],
+            ['FooBarBaz', 5, -1, 'rBaz'],
+        ];
+    }
+
+    /**
+     * @covers       \Phing\Util\StringHelper::substring
+     * @dataProvider substringErrorProvider
+     */
+    public function testSubstringError($string, $start, $end, $message)
+    {
+        $this->expectError();
+        $this->expectErrorMessage($message);
+        StringHelper::substring($string, $start, $end);
+    }
+
+    public function substringErrorProvider()
+    {
+        return [
+            ['FooBarBaz', -1, 1, 'substring(), Startindex out of bounds must be 0<n<9'],
+            ['FooBarBaz', -10, 100, 'substring(), Startindex out of bounds must be 0<n<9'],
+            ['FooBarBaz', 100, 1, 'substring(), Startindex out of bounds must be 0<n<9'],
+            ['FooBarBaz', 0, 100, 'substring(), Endindex out of bounds must be 0<n<8'],
+            ['FooBarBaz', 3, 1, 'substring(), Endindex out of bounds must be 3<n<8'],
+        ];
+    }
 }

From c6a05d468404c0c021d765855ef3da8b2148cd25 Mon Sep 17 00:00:00 2001
From: jawira <dev@tugal.be>
Date: Sun, 16 May 2021 13:46:30 +0200
Subject: [PATCH 5/9] Add simple test for substring

---
 tests/Phing/Util/StringHelperTest.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/Phing/Util/StringHelperTest.php b/tests/Phing/Util/StringHelperTest.php
index 418fa5f92b..af81011b3b 100644
--- a/tests/Phing/Util/StringHelperTest.php
+++ b/tests/Phing/Util/StringHelperTest.php
@@ -197,6 +197,15 @@ public function endsWithProvider()
         ];
     }
 
+    /**
+     * @covers \Phing\Util\StringHelper::substring
+     */
+    public function testSubstringSimple()
+    {
+        $result = StringHelper::substring('FooBarBaz', 3);
+        $this->assertSame('BarBaz', $result);
+    }
+
     /**
      * @covers       \Phing\Util\StringHelper::substring
      * @dataProvider substringProvider

From 15fac50541e282520ebe32ec89f4f975cc3be348 Mon Sep 17 00:00:00 2001
From: jawira <dev@tugal.be>
Date: Sun, 16 May 2021 19:13:44 +0200
Subject: [PATCH 6/9] Add edge cases for substring

---
 tests/Phing/Util/StringHelperTest.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/Phing/Util/StringHelperTest.php b/tests/Phing/Util/StringHelperTest.php
index af81011b3b..5e4060464d 100644
--- a/tests/Phing/Util/StringHelperTest.php
+++ b/tests/Phing/Util/StringHelperTest.php
@@ -219,6 +219,7 @@ public function testSubstring($string, $start, $end, $expected)
     public function substringProvider()
     {
         return [
+            ['FooBarBaz', 0, 0, 'F'],
             ['FooBarBaz', 0, 1, 'Fo'],
             ['FooBarBaz', 2, 4, 'oBa'],
             ['FooBarBaz', 0, 0, 'F'],
@@ -227,6 +228,7 @@ public function substringProvider()
             ['FooBarBaz', 0, -1, 'FooBarBaz'],
             ['FooBarBaz', 5, 8, 'rBaz'],
             ['FooBarBaz', 5, -1, 'rBaz'],
+            ['FooBarBaz', 8, 8, 'z'],
         ];
     }
 

From d160094ddd371c113098204f477aeac986470f5a Mon Sep 17 00:00:00 2001
From: jawira <dev@tugal.be>
Date: Sun, 16 May 2021 19:26:57 +0200
Subject: [PATCH 7/9] Add tests for isSlotVar

---
 tests/Phing/Util/StringHelperTest.php | 32 +++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/Phing/Util/StringHelperTest.php b/tests/Phing/Util/StringHelperTest.php
index 5e4060464d..0161d66463 100644
--- a/tests/Phing/Util/StringHelperTest.php
+++ b/tests/Phing/Util/StringHelperTest.php
@@ -253,4 +253,36 @@ public function substringErrorProvider()
             ['FooBarBaz', 3, 1, 'substring(), Endindex out of bounds must be 3<n<8'],
         ];
     }
+
+    /**
+     * @covers       \Phing\Util\StringHelper::isSlotVar
+     * @dataProvider isSlotVarProvider
+     */
+    public function testIsSlotVar($value, $expected)
+    {
+        $result = StringHelper::isSlotVar($value);
+        $this->assertSame($expected, $result);
+    }
+
+    public function isSlotVarProvider()
+    {
+        return [
+            // 1
+            ['%{x}', 1],
+            ['%{dummy}', 1],
+            ['%{my.var}', 1],
+            ['%{Foo.Bar.Baz}', 1],
+            ['%{user.first-name}', 1],
+            ['    %{slot.var}   ', 1],
+            // 0
+            ['slot.var', 0],
+            ['%{slot§var}', 0],
+            ['%{}', 0],
+            ['%{slotèvar}', 0],
+            ['%{slot%var}', 0],
+            ['%{    slot.var       }', 0],
+            ['}%slot.var{', 0],
+        ];
+    }
+
 }

From f8e56223d22d5efaf20000689f86d618bdd6306d Mon Sep 17 00:00:00 2001
From: jawira <dev@tugal.be>
Date: Sun, 16 May 2021 19:54:55 +0200
Subject: [PATCH 8/9] Add tests for SlotVar

---
 tests/Phing/Util/StringHelperTest.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/tests/Phing/Util/StringHelperTest.php b/tests/Phing/Util/StringHelperTest.php
index 0161d66463..044e0304f6 100644
--- a/tests/Phing/Util/StringHelperTest.php
+++ b/tests/Phing/Util/StringHelperTest.php
@@ -273,9 +273,11 @@ public function isSlotVarProvider()
             ['%{my.var}', 1],
             ['%{Foo.Bar.Baz}', 1],
             ['%{user.first-name}', 1],
+            ['%{user.first_name}', 1],
             ['    %{slot.var}   ', 1],
             // 0
             ['slot.var', 0],
+            ['%{&é@}', 0],
             ['%{slot§var}', 0],
             ['%{}', 0],
             ['%{slotèvar}', 0],
@@ -285,4 +287,25 @@ public function isSlotVarProvider()
         ];
     }
 
+    /**
+     * @covers \Phing\Util\StringHelper::slotVar
+     * @dataProvider slotVarProvider
+     */
+    public function testSlotVar($var, $expected)
+    {
+        $result = StringHelper::slotVar($var);
+        $this->assertSame($expected, $result);
+    }
+
+    public function slotVarProvider()
+    {
+        return [
+            ['%{slot.var}', 'slot.var'],
+            ['%{&é@}', '&é@'],
+            ['', ''],
+            ['%{}', ''],
+            ['%{    }', ''],
+            ['  %{  slot.var  }  ', 'slot.var'],
+        ];
+    }
 }

From d1e176ec0318be2ead9c055a29a2f6c8d6aaaed5 Mon Sep 17 00:00:00 2001
From: jawira <dev@tugal.be>
Date: Sun, 16 May 2021 19:58:28 +0200
Subject: [PATCH 9/9] Add tests for SlotVar

---
 tests/Phing/Util/StringHelperTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/Phing/Util/StringHelperTest.php b/tests/Phing/Util/StringHelperTest.php
index 044e0304f6..1e50d7db8e 100644
--- a/tests/Phing/Util/StringHelperTest.php
+++ b/tests/Phing/Util/StringHelperTest.php
@@ -306,6 +306,7 @@ public function slotVarProvider()
             ['%{}', ''],
             ['%{    }', ''],
             ['  %{  slot.var  }  ', 'slot.var'],
+            ['FooBarBaz', 'FooBarBaz'],
         ];
     }
 }