From 62c5a2503ac0a70de22a92046698c31e216375b6 Mon Sep 17 00:00:00 2001
From: Demin Yin <deminy@deminy.net>
Date: Thu, 18 Jun 2015 15:06:44 -0700
Subject: [PATCH 1/2] Issue #2418619 by Pol: If the root path contains spaces,
 it won't work (drupal commit #5cb729b)

---
 src/Drush/Option.php | 2 +-
 src/Drush/Task.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Drush/Option.php b/src/Drush/Option.php
index 8395753..3aa1a25 100644
--- 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
index e63acb5..9e52912 100644
--- 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);

From b5924b8cad038885fe0c6cee096a474aca320262 Mon Sep 17 00:00:00 2001
From: Demin Yin <deminy@deminy.net>
Date: Thu, 18 Jun 2015 15:13:44 -0700
Subject: [PATCH 2/2] allow the Phing task support Drush 7.0.*

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c2f9e86..f8af857 100644
--- 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": {