Opened IoncubeEncoderTask to all php versions (#1005)

* Opened IoncubeEncoderTask to all versions Removed fallback if unknown encoder version is given because it could cause unexpected behaviour * Update optionaltasks.xml
phingofficial · Dec 9, 2018 · 912fa03 · 912fa03
1 parent 0bbd5d2
commit 912fa03
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/classes/phing/tasks/ext/ioncube/IoncubeEncoderTask.php b/classes/phing/tasks/ext/ioncube/IoncubeEncoderTask.php
@@ -574,12 +574,7 @@ public function main()
     {
         $arguments = $this->constructArguments();
 
-        if (in_array($this->phpVersion, [5, 53, 54, 55, 56, 71])) {
-            $encoderName = $this->encoderName . $this->phpVersion;
-        } else {
-            $encoderName = $this->encoderName;
-        }
-        $encoder = new PhingFile($this->ioncubePath, $encoderName);
+        $encoder = new PhingFile($this->ioncubePath, $this->encoderName . $this->phpVersion);
 
         $this->log("Running ionCube Encoder...");
 

diff --git a/docs/guide/en/source/appendixes/optionaltasks.xml b/docs/guide/en/source/appendixes/optionaltasks.xml
@@ -5001,8 +5001,8 @@ Note that you can omit both startpoint and track attributes in this case
                     </row>
                     <row>
                         <entry><literal>phpversion</literal></entry>
-                        <entry><literal role="type">Integer</literal></entry>
-                        <entry>The PHP version to use</entry>
+                        <entry><literal role="type">String</literal></entry>
+                        <entry>Defines which php encoder version will be used (suffix of the encoder file)</entry>
                         <entry>5</entry>
                         <entry>No</entry>
                     </row>