deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't use an if and two return statements when one return is sufficient.

Browse source 
Don't use two if when one else does the same job.
Don't use convoluted calculations when one return statement is sufficient.
Don't call a method that doesn't exist.
Don't write a try-catch block that does nothing.
Do send exceptions when a abnormal situation occurs.

Closed #962
This commit is contained in:
Adirelle 2015-05-05 10:36:33 +02:00 committed by Tobias van Beek
parent b7d9af1e72
commit 3734d3bc9a
1 changed files with 40 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
PHPCI/Plugin/Codeception.php
View file

@ -52,11 +52,7 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
*/
public static function canExecute($stage, Builder $builder, Build $build)
{
if ($stage == 'test' && !is_null(self::findConfigFile($builder->buildPath))) {
return true;
}
return false;
return $stage == 'test' && !is_null(self::findConfigFile($builder->buildPath));
}
/**
@ -91,8 +87,7 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
if (empty($options['config'])) {
$this->ymlConfigFile = self::findConfigFile($this->phpci->buildPath);
}
if (isset($options['config'])) {
} else {
$this->ymlConfigFile = $options['config'];
}
if (isset($options['args'])) {
@ -109,16 +104,11 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
public function execute()
{
if (empty($this->ymlConfigFile)) {
$this->phpci->logFailure('No configuration file found');
return false;
throw new \Exception("No configuration file found");
}
$success = true;
// Run any config files first. This can be either a single value or an array.
$success &= $this->runConfigFile($this->ymlConfigFile);
return $success;
return $this->runConfigFile($this->ymlConfigFile);
}
/**
@ -129,54 +119,45 @@ class Codeception implements \PHPCI\Plugin, \PHPCI\ZeroConfigPlugin
*/
protected function runConfigFile($configPath)
{
if (is_array($configPath)) {
return $this->recurseArg($configPath, array($this, 'runConfigFile'));
} else {
$this->phpci->logExecOutput(false);
$this->phpci->logExecOutput(false);
$codecept = $this->phpci->findBinary('codecept');
$codecept = $this->phpci->findBinary('codecept');
if (!$codecept) {
$this->phpci->logFailure(Lang::get('could_not_find', 'codecept'));
if (!$codecept) {
$this->phpci->logFailure(Lang::get('could_not_find', 'codecept'));
return false;
}
$cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
if (IS_WIN) {
$cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
}
$configPath = $this->phpci->buildPath . $configPath;
$success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $configPath);
$this->phpci->log(
'Codeception XML path: '. $this->phpci->buildPath . $this->path . '_output/report.xml',
Loglevel::DEBUG
);
$xml = file_get_contents($this->phpci->buildPath . $this->path . '_output/report.xml', false);
try {
$parser = new Parser($this->phpci, $xml);
$output = $parser->parse();
} catch (\Exception $ex) {
throw $ex;
}
$meta = array(
'tests' => $parser->getTotalTests(),
'timetaken' => $parser->getTotalTimeTaken(),
'failures' => $parser->getTotalFailures()
);
$this->build->storeMeta('codeception-meta', $meta);
$this->build->storeMeta('codeception-data', $output);
$this->build->storeMeta('codeception-errors', $parser->getTotalFailures());
$this->phpci->logExecOutput(true);
return $success;
return false;
}
$cmd = 'cd "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
if (IS_WIN) {
$cmd = 'cd /d "%s" && ' . $codecept . ' run -c "%s" --xml ' . $this->args;
}
$configPath = $this->phpci->buildPath . $configPath;
$success = $this->phpci->executeCommand($cmd, $this->phpci->buildPath, $configPath);
$reportPath = $this->phpci->buildPath . $this->path . '_output/report.xml';
if (!file_exists($reportPath)) {
throw new \Exception("Cannot find Codeception XML report: $reportPath");
}
$xml = file_get_contents($reportPath, false);
$parser = new Parser($this->phpci, $xml);
$output = $parser->parse();
$meta = array(
'tests' => $parser->getTotalTests(),
'timetaken' => $parser->getTotalTimeTaken(),
'failures' => $parser->getTotalFailures()
);
$this->build->storeMeta('codeception-meta', $meta);
$this->build->storeMeta('codeception-data', $output);
$this->build->storeMeta('codeception-errors', $parser->getTotalFailures());
$this->phpci->logExecOutput(true);
return $success;
}
}