Skip to content

Exit 1 if an exception is raised while running PHPMD #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 5, 2016
Merged

Exit 1 if an exception is raised while running PHPMD #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 28 additions & 23 deletions Runner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,36 +81,41 @@ public function prefixCodeDirectory($configRulesets)

public function run($files)
{
$resultFile = tempnam(sys_get_temp_dir(), 'phpmd');
try {
$resultFile = tempnam(sys_get_temp_dir(), 'phpmd');

$renderer = new JSONRenderer();
$renderer->setWriter(new StreamWriter($resultFile));
$renderer = new JSONRenderer();
$renderer->setWriter(new StreamWriter($resultFile));

$ruleSetFactory = new RuleSetFactory();
$ruleSetFactory = new RuleSetFactory();

$phpmd = new PHPMD();
$phpmd = new PHPMD();

if (isset($this->config['config']['file_extensions'])) {
$phpmd->setFileExtensions(explode(',', $this->config['config']['file_extensions']));
}
if (isset($this->config['config']['file_extensions'])) {
$phpmd->setFileExtensions(explode(',', $this->config['config']['file_extensions']));
}

$rulesets = Runner::RULESETS;
$rulesets = Runner::RULESETS;

if (isset($this->config['config']['rulesets'])) {
$rulesets = $this->prefixCodeDirectory(
$this->config['config']['rulesets']
);
}
if (isset($this->config['config']['rulesets'])) {
$rulesets = $this->prefixCodeDirectory(
$this->config['config']['rulesets']
);
}

foreach ($files as &$file) {
$phpmd->processFiles(
$file,
$rulesets,
array($renderer),
$ruleSetFactory
);
}
foreach ($files as &$file) {
$phpmd->processFiles(
$file,
$rulesets,
array($renderer),
$ruleSetFactory
);
}

return $resultFile;
return $resultFile;
} catch (Exception $e) {
error_log("Exception: " . $e->getMessage() . " in " . $e->getFile() . "\n" . $e->getTraceAsString());
return "cc_exception_thrown";
}
}
}
13 changes: 10 additions & 3 deletions engine.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,14 @@

$server->process_work(true);

foreach ($server->get_all_results() as $result_file) {
echo file_get_contents($result_file);
unlink($result_file);
$results = $server->get_all_results();

// If there is no output from the runner, an exception must have occurred
foreach ($results as $result_file) {
if ($result_file = "cc_exception_thrown") {
exit(1);
} else {
echo file_get_contents($result_file);
unlink($result_file);
}
}