Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"minimum-stability": "alpha",
"require": {
"drush/drush": ">=9",
"phing/phing": "^3"
"phing/phing": "dev-main"
},
"replace": {
"continuousphp/phing-drush-task": "*"
Expand Down
14 changes: 8 additions & 6 deletions src/Drush/Task.php → src/Drush/DrushTask.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@

namespace Drush;

use PhingFile;
use Phing\Io\File;
use Phing\Task;
use Phing\Exception\BuildException;

/**
* Option
Expand All @@ -23,7 +25,7 @@
* @link https://github.com/drush-ops/drush
* @license http://opensource.org/licenses/MIT MIT License
*/
class Task extends \Task {
class DrushTask extends Task {

/**
* @var string The executed Drush command.
Expand Down Expand Up @@ -113,7 +115,7 @@ class Task extends \Task {
protected $color = FALSE;

/**
* @var PhingFile Working directory.
* @var File Working directory.
*/
protected $dir;

Expand Down Expand Up @@ -291,11 +293,11 @@ public function setColor($var) {
/**
* Specify the working directory for executing this command.
*
* @param PhingFile $dir Working directory
* @param File $dir Working directory
*
* @return void
*/
public function setDir(PhingFile $dir) {
public function setDir(File $dir) {
$this->dir = $dir;
}

Expand Down Expand Up @@ -413,7 +415,7 @@ public function main() {
}
// Build fail.
if ($this->haltOnError && $return != 0) {
throw new \BuildException("Drush exited with code $return");
throw new BuildException("Drush exited with code $return");
}
return $return != 0;
}
Expand Down