mirror of
https://github.com/Karaka-Management/phpOMS.git
synced 2026-02-11 06:28:40 +00:00
Merge branch 'develop' of https://github.com/Orange-Management/phpOMS into develop
This commit is contained in:
commit
7b8b0cc227
|
|
@ -318,7 +318,7 @@ class Account implements ArrayableInterface, \JsonSerializable
|
||||||
*
|
*
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
public function hasPermission(int $permission, ?int $unit = null, ?string $app = null, ?string $module = null, ?int $type = null, ?int $element = null, ?int $component = null) : bool
|
public function hasPermission(int $permission, int $unit = null, string $app = null, string $module = null, int $type = null, int $element = null, int $component = null) : bool
|
||||||
{
|
{
|
||||||
$app = $app !== null ? strtolower($app) : $app;
|
$app = $app !== null ? strtolower($app) : $app;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,16 +35,6 @@ class NetPromoterScore
|
||||||
*/
|
*/
|
||||||
private $scores = [];
|
private $scores = [];
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructor.
|
|
||||||
*
|
|
||||||
* @since 1.0.0
|
|
||||||
*/
|
|
||||||
public function __construct()
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add score.
|
* Add score.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,7 @@ interface LoggerInterface
|
||||||
* @param string $message Logging message schema
|
* @param string $message Logging message schema
|
||||||
* @param array $context Context to log
|
* @param array $context Context to log
|
||||||
*
|
*
|
||||||
* @return null
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function emergency(string $message, array $context = []) : void;
|
public function emergency(string $message, array $context = []) : void;
|
||||||
|
|
||||||
|
|
@ -44,7 +44,7 @@ interface LoggerInterface
|
||||||
* @param string $message Logging message schema
|
* @param string $message Logging message schema
|
||||||
* @param array $context Context to log
|
* @param array $context Context to log
|
||||||
*
|
*
|
||||||
* @return null
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function alert(string $message, array $context = []) : void;
|
public function alert(string $message, array $context = []) : void;
|
||||||
|
|
||||||
|
|
@ -56,7 +56,7 @@ interface LoggerInterface
|
||||||
* @param string $message Logging message schema
|
* @param string $message Logging message schema
|
||||||
* @param array $context Context to log
|
* @param array $context Context to log
|
||||||
*
|
*
|
||||||
* @return null
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function critical(string $message, array $context = []) : void;
|
public function critical(string $message, array $context = []) : void;
|
||||||
|
|
||||||
|
|
@ -67,7 +67,7 @@ interface LoggerInterface
|
||||||
* @param string $message Logging message schema
|
* @param string $message Logging message schema
|
||||||
* @param array $context Context to log
|
* @param array $context Context to log
|
||||||
*
|
*
|
||||||
* @return null
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function error(string $message, array $context = []) : void;
|
public function error(string $message, array $context = []) : void;
|
||||||
|
|
||||||
|
|
@ -80,7 +80,7 @@ interface LoggerInterface
|
||||||
* @param string $message Logging message schema
|
* @param string $message Logging message schema
|
||||||
* @param array $context Context to log
|
* @param array $context Context to log
|
||||||
*
|
*
|
||||||
* @return null
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function warning(string $message, array $context = []) : void;
|
public function warning(string $message, array $context = []) : void;
|
||||||
|
|
||||||
|
|
@ -90,7 +90,7 @@ interface LoggerInterface
|
||||||
* @param string $message Logging message schema
|
* @param string $message Logging message schema
|
||||||
* @param array $context Context to log
|
* @param array $context Context to log
|
||||||
*
|
*
|
||||||
* @return null
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function notice(string $message, array $context = []) : void;
|
public function notice(string $message, array $context = []) : void;
|
||||||
|
|
||||||
|
|
@ -102,7 +102,7 @@ interface LoggerInterface
|
||||||
* @param string $message Logging message schema
|
* @param string $message Logging message schema
|
||||||
* @param array $context Context to log
|
* @param array $context Context to log
|
||||||
*
|
*
|
||||||
* @return null
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function info(string $message, array $context = []) : void;
|
public function info(string $message, array $context = []) : void;
|
||||||
|
|
||||||
|
|
@ -112,7 +112,7 @@ interface LoggerInterface
|
||||||
* @param string $message Logging message schema
|
* @param string $message Logging message schema
|
||||||
* @param array $context Context to log
|
* @param array $context Context to log
|
||||||
*
|
*
|
||||||
* @return null
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function debug(string $message, array $context = []) : void;
|
public function debug(string $message, array $context = []) : void;
|
||||||
|
|
||||||
|
|
@ -123,7 +123,7 @@ interface LoggerInterface
|
||||||
* @param string $message Logging message schema
|
* @param string $message Logging message schema
|
||||||
* @param array $context Context to log
|
* @param array $context Context to log
|
||||||
*
|
*
|
||||||
* @return null
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function log(string $level, string $message, array $context = []) : void;
|
public function log(string $level, string $message, array $context = []) : void;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user