as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

eee

Browse Source
This commit is contained in:
whwyy
2023-12-12 15:35:38 +08:00
parent 827fb257ab
commit 84c253a9f6
17 changed files with 271 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Kiri.php
+4 -4
View File
@@ -50,7 +50,7 @@ class Kiri
* @param string|array $className * @param string|array $className
* @param array $construct * @param array $construct
* @return mixed * @return mixed
* @throws Exception * @throws
*/ */
public static function createObject(string|array $className, array $construct = []): mixed public static function createObject(string|array $className, array $construct = []): mixed
{ {
@@ -72,7 +72,7 @@ class Kiri
/** /**
* @return \Kiri\Pool\Pool * @return \Kiri\Pool\Pool
* @throws ReflectionException|Exception * @throws
*/ */
public static function getPool(): \Kiri\Pool\Pool public static function getPool(): \Kiri\Pool\Pool
{ {
@@ -99,7 +99,7 @@ class Kiri
/** /**
* @return string * @return string
* @throws Exception * @throws
*/ */
public static function getStoragePath(): string public static function getStoragePath(): string
{ {
@@ -123,7 +123,7 @@ class Kiri
/** /**
* @return StdoutLogger * @return StdoutLogger
* @throws ReflectionException|Exception * @throws
*/ */
public static function getLogger(): StdoutLogger public static function getLogger(): StdoutLogger
{ {
ReturnTypeWillChange.php
-15
View File
@@ -1,15 +0,0 @@
<?php
if (!class_exists('\ReturnTypeWillChange')) {
#[\Attribute(\Attribute::TARGET_METHOD)]
final class ReturnTypeWillChange
{
public function __construct()
{
}
}
}
composer.json
+1 -2
View File
@@ -9,7 +9,7 @@
], ],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": ">=8.0", "php": ">=8.3",
"ext-json": "*", "ext-json": "*",
"ext-fileinfo": "*", "ext-fileinfo": "*",
"ext-pdo": "*", "ext-pdo": "*",
@@ -53,7 +53,6 @@
}, },
"files": [ "files": [
"Kiri.php", "Kiri.php",
"ReturnTypeWillChange.php",
"function.php" "function.php"
] ]
} }
kiri-engine/Abstracts/BaseApplication.php
+3 -7
View File
@@ -41,9 +41,7 @@ abstract class BaseApplication extends LocalService
* @param EventProvider $provider * @param EventProvider $provider
* @param ConfigProvider $config * @param ConfigProvider $config
* @param ContainerInterface $container * @param ContainerInterface $container
* @throws ContainerExceptionInterface * @throws
* @throws InitException
* @throws NotFoundExceptionInterface
*/ */
public function __construct(public EventProvider $provider, public ConfigProvider $config, public ContainerInterface $container) public function __construct(public EventProvider $provider, public ConfigProvider $config, public ContainerInterface $container)
{ {
@@ -71,7 +69,7 @@ abstract class BaseApplication extends LocalService
/** /**
* @param ConfigProvider $config * @param ConfigProvider $config
* @return void * @return void
* @throws InitException * @throws
*/ */
public function parseStorage(ConfigProvider $config): void public function parseStorage(ConfigProvider $config): void
{ {
@@ -91,9 +89,7 @@ abstract class BaseApplication extends LocalService
/** /**
* @param ConfigProvider $config * @param ConfigProvider $config
* @return void * @return void
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
* @throws Exception
*/ */
public function parseEvents(ConfigProvider $config): void public function parseEvents(ConfigProvider $config): void
{ {
kiri-engine/Abstracts/Component.php
+3 -3
View File
@@ -51,7 +51,7 @@ class Component implements Configure
/** /**
* @return StdoutLogger * @return StdoutLogger
* @throws ReflectionException * @throws
*/ */
public function getLogger(): StdoutLogger public function getLogger(): StdoutLogger
{ {
@@ -62,7 +62,7 @@ class Component implements Configure
/** /**
* @param string $name * @param string $name
* @return mixed * @return mixed
* @throws Exception * @throws
*/ */
public function __get(string $name) public function __get(string $name)
{ {
@@ -81,7 +81,7 @@ class Component implements Configure
* @param string $name * @param string $name
* @param $value * @param $value
* @return void * @return void
* @throws Exception * @throws
*/ */
public function __set(string $name, $value): void public function __set(string $name, $value): void
{ {
kiri-engine/Abstracts/LocalService.php
+2 -2
View File
@@ -33,7 +33,7 @@ class LocalService extends Component implements LocalServiceInterface
/** /**
* @param string $name * @param string $name
* @return mixed * @return mixed
* @throws Exception * @throws
*/ */
public function get(string $name): mixed public function get(string $name): mixed
{ {
@@ -66,7 +66,7 @@ class LocalService extends Component implements LocalServiceInterface
/** /**
* @param string $name * @param string $name
* @return mixed * @return mixed
* @throws Exception * @throws
*/ */
public function __get(string $name) public function __get(string $name)
{ {
kiri-engine/Application.php
+6 -14
View File
@@ -55,7 +55,7 @@ class Application extends BaseApplication
/** /**
* @return void * @return void
* @throws Exception * @throws
*/ */
public function init(): void public function init(): void
{ {
@@ -71,9 +71,7 @@ class Application extends BaseApplication
/** /**
* @param OnBeforeCommandExecute $beforeCommandExecute * @param OnBeforeCommandExecute $beforeCommandExecute
* @return void * @return void
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
* @throws ReflectionException
*/ */
public function beforeCommandExecute(OnBeforeCommandExecute $beforeCommandExecute): void public function beforeCommandExecute(OnBeforeCommandExecute $beforeCommandExecute): void
{ {
@@ -90,8 +88,7 @@ class Application extends BaseApplication
/** /**
* @param string ...$services * @param string ...$services
* @return $this * @return $this
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
*/ */
public function import(string ...$services): static public function import(string ...$services): static
{ {
@@ -112,8 +109,7 @@ class Application extends BaseApplication
/** /**
* @param Kernel $kernel * @param Kernel $kernel
* @return $this * @return $this
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
*/ */
public function commands(Kernel $kernel): static public function commands(Kernel $kernel): static
{ {
@@ -127,8 +123,7 @@ class Application extends BaseApplication
/** /**
* @param string ...$command * @param string ...$command
* @return void * @return void
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
*/ */
public function command(string ...$command): void public function command(string ...$command): void
{ {
@@ -142,10 +137,7 @@ class Application extends BaseApplication
/** /**
* @param array $argv * @param array $argv
* @return void * @return void
* @throws ContainerExceptionInterface * @throws
* @throws NotFoundExceptionInterface
* @throws ReflectionException
* @throws Exception|ExceptionInterface
*/ */
public function execute(array $argv): void public function execute(array $argv): void
{ {
kiri-engine/Coordinator.php
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Kiri;
class Coordinator class Coordinator
{ {
const WORKER_START = 'worker:start'; const string WORKER_START = 'worker:start';
private bool $waite = false; private bool $waite = false;
kiri-engine/Core/ArrayAccess.php
+73 -75
View File
@@ -10,8 +10,6 @@ declare(strict_types=1);
namespace Kiri\Core; namespace Kiri\Core;
use Exception;
/** /**
* Class ArrayAccess * Class ArrayAccess
* @package Kiri\Core * @package Kiri\Core
@@ -19,82 +17,82 @@ use Exception;
class ArrayAccess class ArrayAccess
{ {
/** /**
* @param $data * @param $data
* @return array * @return array
* @throws Exception * @throws
*/ */
public static function toArray($data): array public static function toArray($data): array
{ {
if (!is_object($data) && !is_array($data)) { if (!is_object($data) && !is_array($data)) {
return []; return [];
} }
if (is_object($data)) { if (is_object($data)) {
$data = self::objToArray($data); $data = self::objToArray($data);
} }
$tmp = []; $tmp = [];
if (!is_array($data)) { if (!is_array($data)) {
return $tmp; return $tmp;
} }
foreach ($data as $key => $val) { foreach ($data as $key => $val) {
if (is_array($val) || is_object($val)) { if (is_array($val) || is_object($val)) {
$tmp[$key] = self::toArray($val); $tmp[$key] = self::toArray($val);
} else { } else {
$tmp[$key] = $val; $tmp[$key] = $val;
} }
} }
return $tmp; return $tmp;
} }
/** /**
* @param $data * @param $data
* @return array * @return array
* @throws Exception * @throws
*/ */
public static function objToArray($data): array public static function objToArray($data): array
{ {
if (!is_object($data)) { if (!is_object($data)) {
return $data; return $data;
} }
if (method_exists($data, 'get')) { if (method_exists($data, 'get')) {
$data = $data->get(); $data = $data->get();
if (is_array($data)) { if (is_array($data)) {
return $data; return $data;
} }
} }
if (method_exists($data, 'toArray')) { if (method_exists($data, 'toArray')) {
$data = $data->toArray(); $data = $data->toArray();
} else { } else {
$data = get_object_vars((object)$data); $data = get_object_vars((object)$data);
} }
return $data; return $data;
} }
/** /**
* @param array $oldArray * @param array $oldArray
* @param array $newArray * @param array $newArray
* @return array * @return array
*/ */
public static function merge(array $oldArray, array $newArray): array public static function merge(array $oldArray, array $newArray): array
{ {
if (empty($oldArray)) { if (empty($oldArray)) {
return $newArray; return $newArray;
} else if (empty($newArray)) { } else if (empty($newArray)) {
return $oldArray; return $oldArray;
} }
foreach ($newArray as $item => $value) { foreach ($newArray as $item => $value) {
if (!isset($oldArray[$item])) { if (!isset($oldArray[$item])) {
$oldArray[$item] = $value; $oldArray[$item] = $value;
} }
if (is_array($value)) { if (is_array($value)) {
$oldArray[$item] = self::merge($oldArray[$item], $value); $oldArray[$item] = self::merge($oldArray[$item], $value);
} else { } else {
$oldArray[$item] = $value; $oldArray[$item] = $value;
} }
} }
return $oldArray; return $oldArray;
} }
} }
kiri-engine/Core/HashMap.php
+4 -4
View File
@@ -38,7 +38,7 @@ class HashMap implements \ArrayAccess, \IteratorAggregate
* @param string $key * @param string $key
* @param $value * @param $value
*/ */
public function put(string $key, $value) public function put(string $key, $value): void
{ {
$this->lists[$key] = $value; $this->lists[$key] = $value;
} }
@@ -78,7 +78,7 @@ class HashMap implements \ArrayAccess, \IteratorAggregate
/** /**
* @param string $key * @param string $key
*/ */
public function del(string $key) public function del(string $key): void
{ {
if (!$this->has($key)) { if (!$this->has($key)) {
return; return;
@@ -122,7 +122,7 @@ class HashMap implements \ArrayAccess, \IteratorAggregate
* @param mixed $value * @param mixed $value
*/ */
#[ReturnTypeWillChange] #[ReturnTypeWillChange]
public function offsetSet(mixed $offset, mixed $value) public function offsetSet(mixed $offset, mixed $value): void
{ {
$this->put($offset, $value); $this->put($offset, $value);
} }
@@ -132,7 +132,7 @@ class HashMap implements \ArrayAccess, \IteratorAggregate
* @param mixed $offset * @param mixed $offset
*/ */
#[ReturnTypeWillChange] #[ReturnTypeWillChange]
public function offsetUnset(mixed $offset) public function offsetUnset(mixed $offset): void
{ {
unset($this->lists[$offset]); unset($this->lists[$offset]);
} }
kiri-engine/Core/Help.php
+2 -2
View File
@@ -61,7 +61,7 @@ class Help
/** /**
* @param $xml * @param $xml
* @return mixed * @return mixed
* @throws Exception * @throws
*/ */
public static function toArray($xml): mixed public static function toArray($xml): mixed
{ {
@@ -111,7 +111,7 @@ class Help
/** /**
* @param $parameter * @param $parameter
* @return array|false|string * @return array|false|string
* @throws Exception * @throws
*/ */
public static function toString($parameter): bool|array|string public static function toString($parameter): bool|array|string
{ {
kiri-engine/Core/Json.php
+121 -121
View File
@@ -20,125 +20,125 @@ use Throwable;
*/ */
class Json class Json
{ {
/** /**
* @param $data * @param $data
* @return false|string * @return false|string
*/ */
public static function encode($data): bool|string public static function encode($data): bool|string
{ {
if (empty($data)) { if (empty($data)) {
return false; return false;
} }
if (is_array($data)) { if (is_array($data)) {
return json_encode($data, JSON_UNESCAPED_UNICODE); return json_encode($data, JSON_UNESCAPED_UNICODE);
} }
return $data; return $data;
} }
/** /**
* @param $data * @param $data
* @param bool $asArray * @param bool $asArray
* @return mixed * @return mixed
*/ */
public static function decode($data, bool $asArray = true): mixed public static function decode($data, bool $asArray = true): mixed
{ {
if (is_array($data) || is_numeric($data)) { if (is_array($data) || is_numeric($data)) {
return $data; return $data;
} }
if (!is_string($data)) return null; if (!is_string($data)) return null;
return json_decode($data, $asArray); return json_decode($data, $asArray);
} }
/** /**
* @param string $message * @param string $message
* @param int $code * @param int $code
* @param array|string $data * @param array|string $data
* @param int $count * @param int $count
* @return string * @return string
*/ */
public static function jsonFail(string $message, int $code = 500, array|string $data = [], int $count = 0): string public static function jsonFail(string $message, int $code = 500, array|string $data = [], int $count = 0): string
{ {
return json_encode(['code' => $code, 'param' => $data, 'message' => $message, 'count' => $count], JSON_UNESCAPED_UNICODE); return json_encode(['code' => $code, 'param' => $data, 'message' => $message, 'count' => $count], JSON_UNESCAPED_UNICODE);
} }
/** /**
* @param string $message * @param string $message
* @param array|string $data * @param array|string $data
* @param int $count * @param int $count
* @return string * @return string
*/ */
public static function jsonSuccess(array|string $data = [], string $message = "ok", int $count = 0): string public static function jsonSuccess(array|string $data = [], string $message = "ok", int $count = 0): string
{ {
return json_encode(['code' => 0, 'param' => $data, 'message' => $message, 'count' => $count], JSON_UNESCAPED_UNICODE); return json_encode(['code' => 0, 'param' => $data, 'message' => $message, 'count' => $count], JSON_UNESCAPED_UNICODE);
} }
/** /**
* @param $code * @param $code
* @param string|array $message * @param string|array $message
* @param array|int $data * @param array|int $data
* @param int $count * @param int $count
* @param array $exPageInfo * @param array $exPageInfo
* @return string|bool * @return string|bool
*/ */
public static function to($code, string|array $message = '', array|int $data = [], int $count = 0, array $exPageInfo = []): string|bool public static function to($code, string|array $message = '', array|int $data = [], int $count = 0, array $exPageInfo = []): string|bool
{ {
$params['code'] = $code; $params['code'] = $code;
if (!is_string($message)) { if (!is_string($message)) {
$params['message'] = 'System success.'; $params['message'] = 'System success.';
$params['param'] = $message; $params['param'] = $message;
$params['exPageInfo'] = $data; $params['exPageInfo'] = $data;
} else { } else {
$params['message'] = $message; $params['message'] = $message;
$params['param'] = $data; $params['param'] = $data;
} }
if (!empty($exPageInfo)) { if (!empty($exPageInfo)) {
$params['exPageInfo'] = $exPageInfo; $params['exPageInfo'] = $exPageInfo;
} }
$params['count'] = $count; $params['count'] = $count;
if (is_numeric($data) || !is_numeric($count)) { if (is_numeric($data) || !is_numeric($count)) {
$params['count'] = $data; $params['count'] = $data;
$params['exPageInfo'] = $count; $params['exPageInfo'] = $count;
} }
if ((int)$params['count'] == -100) { if ((int)$params['count'] == -100) {
$params['count'] = 1; $params['count'] = 1;
} }
return static::encode($params); return static::encode($params);
} }
/** /**
* @param Throwable|Error $throwable * @param Throwable|Error $throwable
* @return bool|string * @return bool|string
*/ */
public static function error(Throwable|Error $throwable): bool|string public static function error(Throwable|Error $throwable): bool|string
{ {
$array['code'] = $throwable->getCode() == 0 ? 500 : $throwable->getCode(); $array['code'] = $throwable->getCode() == 0 ? 500 : $throwable->getCode();
$array['message'] = $throwable->getMessage(); $array['message'] = $throwable->getMessage();
$array['param'] = [ $array['param'] = [
'file' => $throwable->getFile(), 'file' => $throwable->getFile(),
'line' => $throwable->getLine() 'line' => $throwable->getLine()
]; ];
return Json::encode($array); return Json::encode($array);
} }
/** /**
* @param $state * @param $state
* @param $body * @param $body
* @return false|int|string * @return false|int|string
* @throws Exception * @throws
*/ */
public static function output($state, $body): bool|int|string public static function output($state, $body): bool|int|string
{ {
$params['state'] = $state; $params['state'] = $state;
$params['body'] = ArrayAccess::toArray($body); $params['body'] = ArrayAccess::toArray($body);
return static::encode($params); return static::encode($params);
} }
} }
kiri-engine/Core/Str.php
+6 -6
View File
@@ -14,9 +14,9 @@ use Exception;
class Str class Str
{ {
const STRING = 'abcdefghijklmnopqrstuvwxyz'; const string STRING = 'abcdefghijklmnopqrstuvwxyz';
const NUMBER = '01234567890'; const string NUMBER = '01234567890';
/** /**
* @param int $length * @param int $length
@@ -107,7 +107,7 @@ class Str
*/ */
public static function isSerialize($data, $callBack = NULL): bool public static function isSerialize($data, $callBack = NULL): bool
{ {
$false = !empty($data) && swoole_unserialize($data) !== FALSE; $false = !empty($data) && unserialize($data) !== FALSE;
if ($false && is_callable($callBack, TRUE)) { if ($false && is_callable($callBack, TRUE)) {
return call_user_func($callBack, $data); return call_user_func($callBack, $data);
} }
@@ -172,10 +172,10 @@ class Str
public static function filename($file, $type): string public static function filename($file, $type): string
{ {
return match ($type) { return match ($type) {
'image/png' => md5_file($file) . '.png', 'image/png' => md5_file($file) . '.png',
'image/jpeg', 'image/jpg' => md5_file($file) . '.jpg', 'image/jpeg', 'image/jpg' => md5_file($file) . '.jpg',
'image/gif' => md5_file($file) . '.gif', 'image/gif' => md5_file($file) . '.gif',
default => md5_file($file), default => md5_file($file),
}; };
} }
kiri-engine/Core/Xml.php
+34 -34
View File
@@ -18,40 +18,40 @@ use Exception;
class Xml class Xml
{ {
/** /**
* @param $data * @param $data
* @param bool $asArray * @param bool $asArray
* @return array|object * @return array|object
* @throws Exception * @throws
*/ */
public static function toArray($data, bool $asArray = true): object|array public static function toArray($data, bool $asArray = true): object|array
{ {
$data = \simplexml_load_string($data, 'SimpleXMLElement', LIBXML_NOCDATA); $data = \simplexml_load_string($data, 'SimpleXMLElement', LIBXML_NOCDATA);
if ($data === false) { if ($data === false) {
throw new Exception('Parameter format error.'); throw new Exception('Parameter format error.');
} }
$array = \get_object_vars($data); $array = \get_object_vars($data);
if (isset($array[0])) { if (isset($array[0])) {
$array[$data->getName()] = $array[0]; $array[$data->getName()] = $array[0];
unset($array[0]); unset($array[0]);
} }
return $array; return $array;
} }
/** /**
* @param $str * @param $str
* @return array|bool|object * @return array|bool|object
* @throws Exception * @throws
*/ */
public static function isXml($str): object|bool|array public static function isXml($str): object|bool|array
{ {
$xml_parser = \xml_parser_create(); $xml_parser = \xml_parser_create();
if (!\xml_parse($xml_parser, $str, true)) { if (!\xml_parse($xml_parser, $str, true)) {
\xml_parser_free($xml_parser); \xml_parser_free($xml_parser);
return false; return false;
} else { } else {
return self::toArray($str); return self::toArray($str);
} }
} }
} }
kiri-engine/Error/ErrorHandler.php
+3 -4
View File
@@ -92,7 +92,7 @@ class ErrorHandler extends Component implements ErrorInterface
/** /**
* @return void * @return void
* @throws ReflectionException * @throws ReflectionException
* @throws Exception * @throws
*/ */
public function shutdown(): void public function shutdown(): void
{ {
@@ -108,7 +108,7 @@ class ErrorHandler extends Component implements ErrorInterface
/** /**
* @param Throwable $exception * @param Throwable $exception
* *
* @throws Exception * @throws
*/ */
public function exceptionHandler(Throwable $exception): void public function exceptionHandler(Throwable $exception): void
{ {
@@ -121,8 +121,7 @@ class ErrorHandler extends Component implements ErrorInterface
/** /**
* @throws ErrorException * @throws
* @throws ReflectionException
*/ */
public function errorHandler() public function errorHandler()
{ {
kiri-engine/Error/StdoutLogger.php
+1 -1
View File
@@ -99,7 +99,7 @@ class StdoutLogger extends Component
* @param string $name * @param string $name
* @param array $arguments * @param array $arguments
* @return void * @return void
* @throws ReflectionException * @throws
*/ */
public function __call(string $name, array $arguments) public function __call(string $name, array $arguments)
{ {
kiri-engine/Redis/Redis.php
+7 -7
View File
@@ -58,7 +58,7 @@ class Redis
/** /**
* @return void * @return void
* @throws Exception * @throws
*/ */
public function init(): void public function init(): void
{ {
@@ -85,7 +85,7 @@ class Redis
* @param $key * @param $key
* @param int $timeout * @param int $timeout
* @return bool * @return bool
* @throws RedisException * @throws
*/ */
public function waite($key, int $timeout = 5): bool public function waite($key, int $timeout = 5): bool
{ {
@@ -105,7 +105,7 @@ class Redis
* @param $key * @param $key
* @param int $timeout * @param int $timeout
* @return bool|int * @return bool|int
* @throws Exception * @throws
*/ */
public function lock($key, int $timeout = 5): bool|int public function lock($key, int $timeout = 5): bool|int
{ {
@@ -124,7 +124,7 @@ SCRIPT;
/** /**
* @param $key * @param $key
* @return int * @return int
* @throws Exception * @throws
*/ */
public function unlock($key): int public function unlock($key): int
{ {
@@ -165,7 +165,7 @@ SCRIPT;
/** /**
* @return \Redis * @return \Redis
* @throws Exception * @throws
*/ */
private function getClient(): \Redis private function getClient(): \Redis
{ {
@@ -175,7 +175,7 @@ SCRIPT;
/** /**
* @return Pool * @return Pool
* @throws Exception * @throws
*/ */
protected function pool(): Pool protected function pool(): Pool
{ {
@@ -189,7 +189,7 @@ SCRIPT;
/** /**
* @return \Redis * @return \Redis
* @throws RedisConnectException|RedisException * @throws
*/ */
protected function connect(): \Redis protected function connect(): \Redis
{ {