adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-03-12 20:49:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue where missing command would exit as success.

Browse source
This commit is contained in:
mark_story 2011-10-03 23:08:48 -04:00
parent aa7448e3ed
commit 042e817e1b
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Console/Shell.php
View file

@ -351,7 +351,8 @@ class Shell extends Object {
$this->OptionParser = $this->getOptionParser();
list($this->params, $this->args) = $this->OptionParser->parse($argv, $command);
} catch (ConsoleException $e) {
return $this->out($this->OptionParser->help($command));
$this->out($this->OptionParser->help($command));
return false;
}
$this->command = $command;
@ -373,7 +374,8 @@ class Shell extends Object {
if ($isMain) {
return $this->main();
}
return $this->out($this->OptionParser->help($command));
$this->out($this->OptionParser->help($command));
return false;
}
/**

11
lib/Cake/Test/Case/Console/Command/ShellTest.php
View file

@ -747,6 +747,7 @@ class ShellTest extends CakeTestCase {
$result = $Mock->runCommand('idontexist', array());
$this->assertFalse($result);
}
/**
@ -777,14 +778,18 @@ class ShellTest extends CakeTestCase {
public function testRunCommandHittingTask() {
$Shell = $this->getMock('Shell', array('hasTask', 'startup'), array(), '', false);
$task = $this->getMock('Shell', array('execute', 'runCommand'), array(), '', false);
$task->expects($this->any())->method('runCommand')
$task->expects($this->any())
->method('runCommand')
->with('execute', array('one', 'value'));
$Shell->expects($this->once())->method('startup');
$Shell->expects($this->any())->method('hasTask')->will($this->returnValue(true));
$Shell->expects($this->any())
->method('hasTask')
->will($this->returnValue(true));
$Shell->RunCommand = $task;
$Shell->runCommand('run_command', array('run_command', 'one', 'value'));
$result = $Shell->runCommand('run_command', array('run_command', 'one', 'value'));
}
/**