[PathConvert] Fixed validation on attributes. (#1319)

phingofficial · Apr 18, 2020 · 4062888 · 4062888
1 parent 77c655d
commit 4062888
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/classes/phing/tasks/system/PathConvert.php b/classes/phing/tasks/system/PathConvert.php
@@ -362,19 +362,6 @@ private function validateSetup()
             throw new BuildException("You must specify a path to convert");
         }
 
-        if ($this->property === null) {
-            throw new BuildException("You must specify a property");
-        }
-
-        // Must either have a target OS or both a dirSep and pathSep
-
-        if ($this->targetOS == null && $this->pathSep == null && $this->dirSep == null) {
-            throw new BuildException(
-                "You must specify at least one of "
-                . "targetOS, dirSep, or pathSep"
-            );
-        }
-
         // Determine the separator strings.  The dirsep and pathsep attributes
         // override the targetOS settings.
         $dsep = FileUtils::getSeparator();

diff --git a/test/classes/phing/tasks/system/PathConvertTest.php b/test/classes/phing/tasks/system/PathConvertTest.php
@@ -69,6 +69,11 @@ public function testUnique()
         $this->assertCount(6, $l, "6 after preserved duplicates");
     }
 
+    public function testNoTargetOs()
+    {
+        $this->executeTarget('testnotargetos');
+    }
+
     private function assertTarget(string $target)
     {
         $this->executeTarget($target);

diff --git a/test/etc/tasks/system/PathConvertTest.xml b/test/etc/tasks/system/PathConvertTest.xml
@@ -26,4 +26,8 @@
     </pathconvert>
   </target>
 
+  <target name="testnotargetos">
+    <pathconvert property="result" refid="testpath" />
+  </target>
+
 </project>