Skip to content

Commit f51f286

Browse files
author
Frédéric Dewinne
committed
Merge pull request #2 from deminy/master
Merge Drupal.org fix #2418619 and allow the Phing task support Drush 7.0.*
2 parents 9da6c67 + b5924b8 commit f51f286

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
],
1313
"require": {
1414
"phing/phing": "~2.9",
15-
"drush/drush": "~6.5"
15+
"drush/drush": "6.5 - 7.0"
1616
},
1717
"autoload": {
1818
"psr-0": {

src/Drush/Option.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function toString() {
9090
$value = $this->getValue();
9191
$str = '--' . $name;
9292
if (!empty($value)) {
93-
$str .= '=' . $value;
93+
$str .= '="' . escapeshellcmd($value) . '"';
9494
}
9595
return $str;
9696
}

src/Drush/Task.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ public function main() {
389389
$command[] = $this->command;
390390

391391
foreach ($this->params as $param) {
392-
$command[] = $param->getValue();
392+
$command[] = '"' . escapeshellcmd($param->getValue()) . '"';
393393
}
394394

395395
$command = implode(' ', $command);

0 commit comments

Comments
 (0)