deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into fixes-for-windows

Browse source
This commit is contained in:
Dmitry Khomutov 2014-05-09 15:23:39 +07:00
commit 2e1c6e93ce
3 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PHPCI/Builder.php
View file

@ -242,7 +242,7 @@ class Builder implements LoggerAwareInterface
*/
public function executeCommand()
{
return $this->commandExecutor->buildAndExecuteCommand(func_get_args());
return $this->commandExecutor->executeCommand(func_get_args());
}
/**

12
PHPCI/Helper/CommandExecutor.php
View file

@ -50,22 +50,12 @@ class CommandExecutor
$this->rootDir = $rootDir;
}
/**
* Executes shell commands. Accepts multiple arguments the first
* is the template and everything else is inserted in. c.f. sprintf
* @return bool Indicates success
*/
public function executeCommand()
{
return $this->buildAndExecuteCommand(func_get_args());
}
/**
* Executes shell commands.
* @param array $args
* @return bool Indicates success
*/
public function buildAndExecuteCommand($args = array())
public function executeCommand($args = array())
{
$this->lastOutput = array();