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

Added param 'priority_path' (For all plugins) for control paths priority when we search plugin binary. Issue #104.

Browse source
This commit is contained in:
Dmitry Khomutov 2017-07-19 10:26:51 +07:00
commit 59837a8ff1
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
27 changed files with 164 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/PHPCensor/Builder.php
View file

@ -109,7 +109,7 @@ class Builder implements LoggerAwareInterface
$pluginFactory = $this->buildPluginFactory($build);
$this->pluginExecutor = new Plugin\Util\Executor($pluginFactory, $this->buildLogger);
$executorClass = 'PHPCensor\Helper\UnixCommandExecutor';
$executorClass = 'PHPCensor\Helper\CommandExecutor';
$this->commandExecutor = new $executorClass(
$this->buildLogger,
ROOT_DIR,
@ -291,14 +291,18 @@ class Builder implements LoggerAwareInterface
/**
* Find a binary required by a plugin.
*
* @param string $binary
* @param bool $quiet
* @param bool $quiet Returns null instead of throwing an exception.
* @param string $priorityPath
*
* @return null|string
*
* @throws \Exception when no binary has been found and $quiet is false.
*/
public function findBinary($binary, $quiet = false)
public function findBinary($binary, $quiet = false, $priorityPath = 'local')
{
return $this->commandExecutor->findBinary($binary, $quiet);
return $this->commandExecutor->findBinary($binary, $quiet, $priorityPath);
}
/**