Merge pull request #2 from deminy/master

Merge Drupal.org fix #2418619 and allow the Phing task support Drush 7.0.*
continuousphp · Jun 19, 2015 · f51f286 · f51f286
2 parents 9da6c67 + b5924b8
commit f51f286
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
   ],
   "require": {
     "phing/phing": "~2.9",
-    "drush/drush": "~6.5"
+    "drush/drush": "6.5 - 7.0"
   },
   "autoload": {
     "psr-0": {

diff --git a/src/Drush/Option.php b/src/Drush/Option.php
@@ -90,7 +90,7 @@ public function toString() {
         $value = $this->getValue();
         $str = '--' . $name;
         if (!empty($value)) {
-            $str .= '=' . $value;
+            $str .= '="' . escapeshellcmd($value) . '"';
         }
         return $str;
     }

diff --git a/src/Drush/Task.php b/src/Drush/Task.php
@@ -389,7 +389,7 @@ public function main() {
     $command[] = $this->command;
 
     foreach ($this->params as $param) {
-      $command[] = $param->getValue();
+      $command[] = '"' . escapeshellcmd($param->getValue()) . '"';
     }
 
     $command = implode(' ', $command);