Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-01-11 17:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix permission type and error logs

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-09-21 23:01:49 +02:00
parent bfc457115c
commit 536d480a36
2 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Account/PermissionAbstract.php
View File

@ -25,7 +25,7 @@ namespace phpOMS\Account;
* @link http://website.orange-management.de * @link http://website.orange-management.de
* @since 1.0.0 * @since 1.0.0
*/ */
class PermissionAbstract class PermissionAbstract implements \JsonSerializable
{ {
/** /**
* Permission id. * Permission id.
@ -54,7 +54,7 @@ class PermissionAbstract
/** /**
* Module id. * Module id.
* *
* @var int|null * @var string|null
* @since 1.0.0 * @since 1.0.0
*/ */
protected $module = null; protected $module = null;
@ -166,11 +166,11 @@ class PermissionAbstract
/** /**
* Get module id. * Get module id.
* *
* @return int|null * @return string|null
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function getModule() : ?int public function getModule() : ?string
{ {
return $this->module; return $this->module;
} }
@ -178,13 +178,13 @@ class PermissionAbstract
/** /**
* Set module id. * Set module id.
* *
* @param int $module Module * @param string $module Module
* *
* @return void * @return void
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function setModule(int $module = null) : void public function setModule(string $module = null) : void
{ {
$this->module = $module; $this->module = $module;
} }
@ -346,4 +346,22 @@ class PermissionAbstract
{ {
return ($this->permission | $permission) === $this->permission; return ($this->permission | $permission) === $this->permission;
} }
/**
* {@inheritdoc}
*/
public function jsonSerialize()
{
return [
'id' => $this->id,
'unit' => $this->unit,
'app' => $this->app,
'module' => $this->module,
'from' => $this->from,
'type' => $this->type,
'element' => $this->element,
'component' => $this->component,
'permission' => $this->permission,
];
}
} }

12
UnhandledHandler.php
View File

@ -62,26 +62,19 @@ final class UnhandledHandler
$logger = FileLogger::getInstance(__DIR__ . '/../Logs'); $logger = FileLogger::getInstance(__DIR__ . '/../Logs');
if (!(\error_reporting() & $errno)) { if (!(\error_reporting() & $errno)) {
$logger->error(FileLogger::MSG_FULL, [
'message' => 'Undefined error',
'line' => $errline,
'file' => $errfile,
]);
\error_clear_last(); \error_clear_last();
return false; return false;
} }
\error_clear_last();
$logger->error(FileLogger::MSG_FULL, [ $logger->error(FileLogger::MSG_FULL, [
'message' => 'Unhandled error', 'message' => 'Undefined error',
'line' => $errline, 'line' => $errline,
'file' => $errfile, 'file' => $errfile,
]); ]);
\error_clear_last();
return true; return true;
} }
@ -96,6 +89,7 @@ final class UnhandledHandler
public static function shutdownHandler() : void public static function shutdownHandler() : void
{ {
$e = \error_get_last(); $e = \error_get_last();
\error_clear_last();
if ($e !== null) { if ($e !== null) {
$logger = FileLogger::getInstance(__DIR__ . '/../Logs'); $logger = FileLogger::getInstance(__DIR__ . '/../Logs');