Commit f563339c authored by Alex Ne's avatar Alex Ne

правка кодов ошибок. 0 - не ошибка, это сообщение, 1 - это уже неизвестная ошибка

parent bf7963ac
......@@ -38,7 +38,7 @@ class EItem extends \Exception {
/**
* @param enum $type paranoid | trace | system | fatal | error | notification
* @param string $message
* @param int $code [= 0]
* @param int $code [= 1]
* @param string $file [= false]
* @param int $line [= false]
* @param array $context [= []]
......@@ -46,7 +46,7 @@ class EItem extends \Exception {
/**
* @return mixed
*/
public function __construct($type, $message, $code = 0, $file = false, $line = false, $context = []) {
public function __construct($type, $message, $code = 1, $file = false, $line = false, $context = []) {
parent::__construct($message, intval($code));
if ( ! ($file === false)) {
$this->file = $file;
......
<?php
namespace X\ETrace;
class Error extends EItem
{
class Error extends EItem {
/**
* @var mixed
*/
......@@ -16,32 +15,28 @@ class Error extends EItem
* @param int $line [= false]
* @param array $context [= []]
*/
public function __construct($message, $severity = 0, $file = false, $line = false, $context = [])
{
parent::__construct("error", $message, 0, $file, $line, $context);
public function __construct($message, $severity = 0, $file = false, $line = false, $context = []) {
parent::__construct("error", $message, 1, $file, $line, $context);
$this->severity = $severity;
}
/**
* @return mixed
*/
public function getSeverity()
{
public function getSeverity() {
return $this->severity;
}
/**
* @return mixed
*/
public function Trace()
{
public function Trace() {
$trace = parent::Trace();
array_shift($trace);
return $trace;
}
public function Model()
{
public function Model() {
return array_merge(["severity" => $this->severity], parent::Model());
}
}
......
<?php
namespace X\ETrace;
class Fatal extends EItem
{
class Fatal extends EItem {
/**
* @var mixed
*/
......@@ -17,25 +16,22 @@ class Fatal extends EItem
* @param false $line
* @param array $context
*/
public function __construct($message, $severity = 0, $file = false, $line = false)
{
parent::__construct("fatal", $message, 0, $file, $line, []);
public function __construct($message, $severity = 0, $file = false, $line = false) {
parent::__construct("fatal", $message, 1, $file, $line, []);
$this->severity = $severity;
}
/**
* @return mixed
*/
public function getSeverity()
{
public function getSeverity() {
return $this->severity;
}
/**
* @return mixed
*/
public function Trace()
{
public function Trace() {
$trace = parent::Trace();
array_shift($trace);
return $trace;
......
......@@ -8,7 +8,7 @@ class Notification extends EItem {
* @param array $context
*/
public function __construct($message, $context = []) {
parent::__construct("notification", $message, 1, false, false, $context);
parent::__construct("notification", $message, 0, false, false, $context);
}
}
?>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment