up: move some util class to stdlib

Author: inhere

src/Util/PhpError.php

@@ -9,98 +9,12 @@
 
 namespace Toolkit\Sys\Util;
 
-use const E_COMPILE_ERROR;
-use const E_COMPILE_WARNING;
-use const E_CORE_ERROR;
-use const E_CORE_WARNING;
-use const E_DEPRECATED;
-use const E_ERROR;
-use const E_NOTICE;
-use const E_PARSE;
-use const E_RECOVERABLE_ERROR;
-use const E_STRICT;
-use const E_USER_DEPRECATED;
-use const E_USER_ERROR;
-use const E_USER_NOTICE;
-use const E_USER_WARNING;
-use const E_WARNING;
-
 /**
  * Class PhpError
  *
  * @package Toolkit\Sys\Util
+ * @deprecated
  */
-class PhpError
+class PhpError extends \Toolkit\Stdlib\Util\PhpError
 {
-    /** @var array */
-    public static $fatalErrors = [E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR];
-
-    /**
-     * $lastError = error_get_last();
-     *
-     * @param array       $lastError
-     * @param null|string $catcher
-     *
-     * @return array
-     */
-    public static function toArray(array $lastError, $catcher = null): array
-    {
-        $digest = 'Fatal Error (' . self::codeToString($lastError['type']) . '): ' . $lastError['message'];
-        $data   = [
-            'code'    => $lastError['type'],
-            'message' => $lastError['message'],
-            'file'    => $lastError['file'],
-            'line'    => $lastError['line'],
-            'catcher' => __METHOD__,
-        ];
-
-        if ($catcher) {
-            $data['catcher'] = $catcher;
-        }
-
-        return [$digest, $data];
-    }
-
-    /**
-     * @param int $code
-     *
-     * @return string
-     */
-    public static function codeToString(int $code): string
-    {
-        switch ($code) {
-            case E_ERROR:
-                return 'E_ERROR';
-            case E_WARNING:
-                return 'E_WARNING';
-            case E_PARSE:
-                return 'E_PARSE';
-            case E_NOTICE:
-                return 'E_NOTICE';
-            case E_CORE_ERROR:
-                return 'E_CORE_ERROR';
-            case E_CORE_WARNING:
-                return 'E_CORE_WARNING';
-            case E_COMPILE_ERROR:
-                return 'E_COMPILE_ERROR';
-            case E_COMPILE_WARNING:
-                return 'E_COMPILE_WARNING';
-            case E_USER_ERROR:
-                return 'E_USER_ERROR';
-            case E_USER_WARNING:
-                return 'E_USER_WARNING';
-            case E_USER_NOTICE:
-                return 'E_USER_NOTICE';
-            case E_STRICT:
-                return 'E_STRICT';
-            case E_RECOVERABLE_ERROR:
-                return 'E_RECOVERABLE_ERROR';
-            case E_DEPRECATED:
-                return 'E_DEPRECATED';
-            case E_USER_DEPRECATED:
-                return 'E_USER_DEPRECATED';
-        }
-
-        return 'Unknown PHP error';
-    }
 }

src/Util/PhpException.php

@@ -9,139 +9,12 @@
 
 namespace Toolkit\Sys\Util;
 
-use Throwable;
-use function get_class;
-use function json_encode;
-use function strip_tags;
-
 /**
  * Class PhpException
  *
  * @package Toolkit\Sys\Util
+ * @deprecated
  */
-class PhpException
+class PhpException extends \Toolkit\Stdlib\Util\PhpException
 {
-    /**
-     * @param Throwable $e
-     * @param bool      $getTrace
-     * @param null      $catcher
-     *
-     * @return string
-     * @see PhpException::toHtml()
-     */
-    public static function toText(Throwable $e, bool $getTrace = true, $catcher = null): string
-    {
-        return self::toHtml($e, $getTrace, $catcher, true);
-    }
-
-    /**
-     * @param Throwable $e
-     * @param bool      $getTrace
-     * @param null      $catcher
-     *
-     * @return string
-     * @see PhpException::toHtml()
-     */
-    public static function toString(Throwable $e, bool $getTrace = true, $catcher = null): string
-    {
-        return self::toHtml($e, $getTrace, $catcher, true);
-    }
-
-    /**
-     * Converts an exception into a simple string.
-     *
-     * @param Throwable   $e the exception being converted
-     * @param bool        $clearHtml
-     * @param bool        $getTrace
-     * @param null|string $catcher
-     *
-     * @return string the string representation of the exception.
-     */
-    public static function toHtml(Throwable $e, bool $getTrace = true, string $catcher = null, bool $clearHtml = false): string
-    {
-        if (!$getTrace) {
-            $message = "Error: {$e->getMessage()}";
-        } else {
-            $message = sprintf(
-                "<h3>%s(%d): %s</h3>\n<pre><strong>File: %s(Line %d)</strong>%s \n\n%s</pre>",
-                get_class($e),
-                $e->getCode(),
-                $e->getMessage(),
-                $e->getFile(),
-                $e->getLine(),
-                $catcher ? "\nCatch By: $catcher" : '',
-                $e->getTraceAsString()
-            );
-        }
-
-        return $clearHtml ? strip_tags($message) : "<div class=\"exception-box\">{$message}</div>";
-    }
-
-    /**
-     * Converts an exception into a simple array.
-     *
-     * @param Throwable   $e the exception being converted
-     * @param bool        $getTrace
-     * @param null|string $catcher
-     *
-     * @return array
-     */
-    public static function toArray(Throwable $e, bool $getTrace = true, string $catcher = null): array
-    {
-        $data = [
-            'class'   => get_class($e),
-            'message' => $e->getMessage(),
-            'code'    => $e->getCode(),
-            'file'    => $e->getFile() . ':' . $e->getLine(),
-        ];
-
-        if ($catcher) {
-            $data['catcher'] = $catcher;
-        }
-
-        if ($getTrace) {
-            $data['trace'] = $e->getTrace();
-        }
-
-        return $data;
-    }
-
-    /**
-     * Converts an exception into a json string.
-     *
-     * @param Throwable   $e the exception being converted
-     * @param bool        $getTrace
-     * @param null|string $catcher
-     *
-     * @return string the string representation of the exception.
-     */
-    public static function toJson(Throwable $e, bool $getTrace = true, string $catcher = null): string
-    {
-        if (!$getTrace) {
-            return json_encode(['msg' => "Error: {$e->getMessage()}"]);
-        }
-
-        $map = [
-            'code' => $e->getCode() ?: 500,
-            'msg'  => sprintf(
-                '%s(%d): %s, File: %s(Line %d)',
-                get_class($e),
-                $e->getCode(),
-                $e->getMessage(),
-                $e->getFile(),
-                $e->getLine()
-            ),
-            'data' => $e->getTrace()
-        ];
-
-        if ($catcher) {
-            $map['catcher'] = $catcher;
-        }
-
-        if ($getTrace) {
-            $map['trace'] = $e->getTrace();
-        }
-
-        return json_encode($map);
-    }
 }