wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modify CliController for opportunity to extend this class.

Browse Source
This commit is contained in:
Alexander Demidov
2014-03-05 19:11:11 +04:00
parent a090d52676
commit 740bd6b7f3
1 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/CliController.php
View File

@ -46,7 +46,7 @@ class CliController
public static function getInstance() public static function getInstance()
{ {
if (!isset(self::$instance)) { if (!isset(self::$instance)) {
self::$instance = new self(); self::$instance = new static();
} }
return self::$instance; return self::$instance;
} }
@ -58,6 +58,15 @@ class CliController
public function execute($cli) public function execute($cli)
{ {
try { try {
$this->run($cli);
}
catch (Exception $e) {
$this->exception($e);
}
}
protected function run($cli)
{
if (is_string($cli)) { if (is_string($cli)) {
if (!class_exists($cli)) { if (!class_exists($cli)) {
throw new GeneralException('Action class "' . $cli . '" not found.'); throw new GeneralException('Action class "' . $cli . '" not found.');
@ -77,7 +86,9 @@ class CliController
} }
} }
} }
catch (Exception $e) {
protected function exception($e)
{
$code = $e->getCode(); $code = $e->getCode();
if ($e instanceof ErrorException) { if ($e instanceof ErrorException) {
$code = $e->getSeverity(); $code = $e->getSeverity();
@ -85,5 +96,4 @@ class CliController
file_put_contents($this->error_stream, PHP_EOL . 'Error ' . '#' . $code . ': ' . $e->getMessage() . PHP_EOL, FILE_APPEND); file_put_contents($this->error_stream, PHP_EOL . 'Error ' . '#' . $code . ': ' . $e->getMessage() . PHP_EOL, FILE_APPEND);
file_put_contents($this->error_stream, PHP_EOL . 'Stack trace: ' . PHP_EOL . $e->getTraceAsString() . PHP_EOL, FILE_APPEND); file_put_contents($this->error_stream, PHP_EOL . 'Stack trace: ' . PHP_EOL . $e->getTraceAsString() . PHP_EOL, FILE_APPEND);
} }
}
} }