Skip to content

Only fail when errors are raised #312

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
veewee merged 1 commit into from
Feb 24, 2017
Merged

Only fail when errors are raised #312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions spec/Task/Php7ccSpec.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ function it_runs_the_suite(ProcessBuilder $processBuilder, Process $process, Con

$process->run()->shouldBeCalled();
$process->isSuccessful()->willReturn(true);
$process->getOutput()->willReturn('');

$context->getFiles()->willReturn(new FilesCollection([
new SplFileInfo('test.php', '.', 'test.php')
Expand All @@ -90,8 +91,17 @@ function it_throws_exception_if_the_process_fails(ProcessBuilder $processBuilder
$processBuilder->createArgumentsForCommand('php7cc')->willReturn($arguments);
$processBuilder->buildProcess($arguments)->willReturn($process);

$failedOutput = <<<'OUTPUT'
File: /path/to/bad.php
> Line 3: Removed argument $is_dst used for function "mktime"
mktime(5, 5, 5, 5, 5, 2000, -1);

Checked 2 files in 0.040 second
OUTPUT;

$process->run()->shouldBeCalled();
$process->isSuccessful()->willReturn(false);
$process->getOutput()->willReturn($failedOutput);

$context->getFiles()->willReturn(new FilesCollection([
new SplFileInfo('test.php', '.', 'test.php')
Expand Down
2 changes: 1 addition & 1 deletion src/Task/Php7cc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function run(ContextInterface $context)
$process = $this->processBuilder->buildProcess($arguments);
$process->run();

if (!$process->isSuccessful()) {
if (preg_match('/^File: /m', $process->getOutput()) === 1) {
return TaskResult::createFailed($this, $context, $this->formatter->format($process));
}

Expand Down