stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

closes #34 (exception code for entity not found)

Browse source
This commit is contained in:
Steffen Vogel 2010-12-06 12:04:49 +01:00
parent 3574f4849d
commit af36ccdd93
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/lib/Controller/EntityController.php
View file

@ -55,7 +55,7 @@ class EntityController extends Controller {
try {
return $q->getSingleResult();
} catch (\Doctrine\ORM\NoResultException $e) {
throw new \Exception('No entity found with UUID: ' . $uuid);
throw new \Exception('No entity found with UUID: ' . $uuid, 404);
}
}

4
backend/lib/View/HTTP/Response.php
View file

@ -123,9 +123,7 @@ class Response {
public function getHeader($header) { return $this->headers[$header]; }
public function getCode() { return $this->code; }
public function setCode($code) { $this->code = $code; }
static public function getCodeDescription($code) {
return (isset(self::$codes[$code])) ? self::$codes[$code] : FALSE;
}
static public function getCodeDescription($code) { return (isset(self::$codes[$code])) ? self::$codes[$code] : FALSE; }
}
?>

7
backend/lib/View/View.php
View file

@ -82,10 +82,15 @@ abstract class View {
$this->exceptionHandler(new \ErrorException($errstr, 0, $errno, $errfile, $errline));
}
/**
* Handles exceptions and sets HTTP return code
*
* @param \Exception $exception
*/
final public function exceptionHandler(\Exception $exception) {
$this->addException($exception, Util\Debug::isActivated());
$code = ($exception->getCode() == 0 && HTTP\Response::getCodeDescription($exception->getCode())) ? 400 : $exception->getCode();
$code = ($exception->getCode() == 0 || !HTTP\Response::getCodeDescription($exception->getCode())) ? 400 : $exception->getCode();
$this->response->setCode($code);
$this->send();