定版

Author: Kooooooma

README.md

@@ -23,4 +23,10 @@ error_reporting = E_ALL & E_STRICT
 ```
 
 # 使用
-请参考 tests 用例
+```php
+$baseDir = dirname(__DIR__);
+
+require $baseDir.'/vendor/autoload.php';
+
+$errorHandler = \PHPErrors\PHPErrors::enable(E_ALL, true);
+```

src/PHPErrors.php

@@ -16,28 +16,26 @@
 class PHPErrors
 {
     public $logger;
-    public static $reportLevel = E_ALL;
+    public $displayErrors = false;
+    public static $errorReportLevel = E_ALL;
 
-    public static function enable($errorReportLevel = E_ALL, $devMode = true)
+    public function __construct($displayErrors = false)
+    {
+        $this->displayErrors = $displayErrors;
+    }
+
+    public static function enable($errorReportLevel = E_ALL, $displayErrors = false)
     {
         if ($errorReportLevel != null) {
             error_reporting($errorReportLevel);
-            self::$reportLevel = $errorReportLevel;
+            self::$errorReportLevel = $errorReportLevel;
         } else {
             error_reporting(E_ALL);
         }
 
-        if ($devMode) {
-            ini_set('display_errors', 1);
-            ini_set('display_startup_errors', 1);
-        } else {
-            ini_set('display_errors', 0);
-            ini_set('display_startup_errors', 0);
-        }
-
         ini_set('log_errors', 1);
 
-        $handler = new static();
+        $handler = new static($displayErrors);
         return $handler->register();
     }
 
@@ -55,10 +53,14 @@ public function log($type, $message)
         $level = $this->getErrorLevel($type);
 
         if ( $this->logger != null ) {
-            return $this->logger->log($level, $message);
+            $this->logger->log($level, $message);
+        } else {
+            error_log("{$level}: {$message}");
         }
 
-        error_log("{$level}: {$message}");
+        if ( $this->displayErrors ) {
+            print "{$level}: {$message}";
+        }
     }
 
     public function setLogger($logger)
@@ -73,43 +75,48 @@ public function handleFatalError()
         if (!empty($error)) {
             $type = $error['type'];
 
-            if ($type & self::$reportLevel) {
+            if ($type & self::$errorReportLevel) {
                 $message = $this->formatMessage($error['message'], $error['file'], $error['line']);
 
-                return $this->log($type, $message);
+                $this->log($type, $message);
             }
         }
     }
 
     public function handleError($type, $message, $file, $line)
     {
-        if ($type & self::$reportLevel) {
+        if ($type & self::$errorReportLevel) {
             $message = $this->formatMessage($message, $file, $line);
 
-            return $this->log($type, $message);
+            $this->log($type, $message);
         }
     }
 
     public function handleException(\Throwable $exception)
     {
-        //Error code 需要转换成 Exception 的错误级别
-        //这里把所有的 Error 都转换成 E_ERROR 级别异常, 用来做捕获
+        //把所有Error都当做成是致命的错误处理
         if ($exception instanceof \Error) {
-            $exception = new \ErrorException($exception->getMessage(), 0, E_ERROR, $exception->getFile(), $exception->getLine());
+            $exception = new \ErrorException(
+                $exception->getMessage(),
+                $exception->getCode(),
+                E_ERROR,
+                $exception->getFile(),
+                $exception->getLine()
+            );
         }
 
-        if ($exception instanceof \ErrorException || $exception instanceof \Exception) {
+        if ($exception instanceof \Exception) {
             $type = $exception instanceof \ErrorException ? $exception->getSeverity() : E_ERROR;
 
-            if ($type & self::$reportLevel) {
+            if ($type & self::$errorReportLevel) {
                 $message = $this->formatMessage(
                     $exception->getMessage(),
                     $exception->getFile(),
                     $exception->getLine(),
                     $exception->getTraceAsString()
                 );
 
-                return $this->log($type, $message);
+                $this->log($type, $message);
             }
         }
     }

tests/PHPErrorsTest.php

@@ -3,7 +3,7 @@
 
 require $baseDir.'/vendor/autoload.php';
 
-$errorHandler = \PHPErrors\PHPErrors::enable(E_ALL & ~E_ERROR, false);
+$errorHandler = \PHPErrors\PHPErrors::enable(E_ALL & ~E_WARNING, true);
 
 //$logger = new \Monolog\Logger("test");
 //$logger->pushHandler(new \Monolog\Handler\StreamHandler(__DIR__."/test.log"));
@@ -12,5 +12,15 @@
 
 
 //test error
-echo $x; //E_NOTICE
-$fatal->error(); //E_ERROR
+$a = 1/0;
+echo @$x; //E_NOTICE
+@$fatal->error(); //E_ERROR
+//echo $y;
+
+//throw new \Exception("dfdsd");
+
+try {
+    throw new \Exception("dfdsd");
+} catch (\Exception $e) {
+
+}