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

Revert "改名"

Browse Source 
This reverts commit fdf58326
This commit is contained in:
向林
2022-01-12 14:10:33 +08:00
parent 1ae1d78ddf
commit 7b1cc1bd7b
53 changed files with 739 additions and 726 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kiri-engine/Kiri.php → Kiri.php
+642 -636
View File
File diff suppressed because it is too large Load Diff
composer.json
+1
View File
@@ -39,6 +39,7 @@
"Kiri\\Task\\": "kiri-task/"
},
"files": [
"Kiri.php",
"error.php",
"function.php"
]
function.php
-1
View File
@@ -14,7 +14,6 @@ use Kiri\Error\Logger;
use Kiri\Events\EventDispatch;
use Kiri\Events\EventProvider;
use Kiri\Exception\ConfigException;
use Kiri\Kiri;
use Kiri\Message\Handler\Router;
use Psr\Log\LoggerInterface;
use Swoole\Process;
kiri-annotation/Event.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Kiri\Annotation;
use Exception;
use Kiri\Events\EventProvider;
use Kiri\Kiri;
use Kiri;
/**
kiri-annotation/Inject.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Kiri\Annotation;
use Exception;
use Kiri\Core\Str;
use Kiri\Kiri;
use Kiri;
use ReflectionException;
use ReflectionProperty;
kiri-annotation/Loader.php
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Kiri\Annotation;
use DirectoryIterator;
use Exception;
use Kiri\Abstracts\Component;
use Kiri\Kiri;
use Kiri;
use ReflectionClass;
use ReflectionException;
use Throwable;
kiri-annotation/Mapping.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace Kiri\Annotation;
use Kiri\Kiri;
use Kiri;
#[\Attribute(\Attribute::TARGET_CLASS)] class Mapping extends Attribute
{
kiri-annotation/Route/Route.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Kiri\Annotation\Route;
use Kiri\Annotation\Attribute;
use Kiri\Message\Handler\Router;
use Kiri\Kiri;
use Kiri;
#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)] class Route extends Attribute
{
kiri-annotation/Task.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Kiri\Annotation;
use Exception;
use Kiri\Kiri;
use Kiri;
use Kiri\Server\Tasker\AsyncTaskExecute;
kiri-engine/Abstracts/BaseApplication.php
+1 -1
View File
@@ -26,7 +26,7 @@ use Swoole\Table;
/**
* Class BaseApplication
* @package Kiri\Kiri\Base
* @package Kiri\Base
*/
abstract class BaseApplication extends Component
{
kiri-engine/Abstracts/Component.php
+2 -2
View File
@@ -15,14 +15,14 @@ use JetBrains\PhpStorm\Pure;
use Kiri\Di\Container;
use Kiri\Events\EventDispatch;
use Kiri\Events\EventProvider;
use Kiri\Kiri;
use Kiri;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\ContainerInterface;
use Psr\Container\NotFoundExceptionInterface;
/**
* Class Component
* @package Kiri\Kiri\Base
* @package Kiri\Base
* @property ContainerInterface|Container $container
* @property EventProvider $eventProvider
* @property EventDispatch $eventDispatch
kiri-engine/Abstracts/Config.php
+1 -1
View File
@@ -14,7 +14,7 @@ use Kiri\Exception\ConfigException;
/**
* Class Config
* @package Kiri\Kiri\Base
* @package Kiri\Base
*/
class Config extends Component
{
kiri-engine/Abstracts/Configure.php
+1 -1
View File
@@ -10,7 +10,7 @@ namespace Kiri\Abstracts;
/**
* Interface Configure
* @package Kiri\Kiri\Base
* @package Kiri\Base
*/
interface Configure
{
kiri-engine/Abstracts/Logger.php
+1 -1
View File
@@ -6,7 +6,7 @@ use DirectoryIterator;
use Exception;
use Kiri\Events\EventProvider;
use Kiri\Exception\ConfigException;
use Kiri\Kiri;
use Kiri;
use Kiri\Server\Events\OnWorkerStop;
use Psr\Log\LoggerInterface;
use ReflectionException;
kiri-engine/Application.php
+2
View File
@@ -29,6 +29,8 @@ use Symfony\Component\Console\{Application as ConsoleApplication,
Output\ConsoleOutput,
Output\OutputInterface
};
use Kiri;
/**
* Class Init
kiri-engine/Async.php
+1 -1
View File
@@ -8,7 +8,7 @@ use Exception;
use Kiri\Abstracts\Component;
use Kiri\Server\ServerManager;
use Kiri\Server\Tasker\AsyncTaskExecute;
use Kiri;
/**
* Class Async
* @package Kiri
kiri-engine/Cache/Base/Redis.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Kiri\Cache\Base;
use Exception;
use Kiri\Abstracts\Logger;
use Kiri\Exception\RedisConnectException;
use Kiri\Kiri;
use Kiri;
use Kiri\Pool\StopHeartbeatCheck;
use RedisException;
use Swoole\Timer;
kiri-engine/Cache/File.php
+1 -1
View File
@@ -16,7 +16,7 @@ use Swoole\Coroutine\System;
/**
* Class File
* @package Kiri\Kiri\Cache
* @package Kiri\Cache
*/
class File extends Component implements ICache
{
kiri-engine/Cache/ICache.php
+1 -1
View File
@@ -11,7 +11,7 @@ namespace Kiri\Cache;
/**
* Interface ICache
* @package Kiri\Kiri\Cache
* @package Kiri\Cache
*/
interface ICache
{
kiri-engine/Cache/Redis.php
+2 -2
View File
@@ -15,7 +15,7 @@ use Kiri\Abstracts\Config;
use Kiri\Core\Json;
use Kiri\Events\EventProvider;
use Kiri\Exception\ConfigException;
use Kiri\Kiri;
use Kiri;
use Kiri\Pool\Redis as PoolRedis;
use Kiri\Annotation\Inject;
use Kiri\Server\Events\OnWorkerExit;
@@ -23,7 +23,7 @@ use Swoole\Timer;
/**
* Class Redis
* @package Kiri\Kiri\Cache
* @package Kiri\Cache
* @mixin \Redis
*/
class Redis extends Component
kiri-engine/Context.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Kiri;
use Kiri\Abstracts\BaseContext;
use Swoole\Coroutine;
use Kiri;
/**
* Class Context
* @package Yoc\http
kiri-engine/Core/DateFormat.php
+1 -1
View File
@@ -13,7 +13,7 @@ namespace Kiri\Core;
/**
* Class DateFormat
* @package Kiri\Kiri\Core
* @package Kiri\Core
*/
class DateFormat
{
kiri-engine/Core/Help.php
+1 -1
View File
@@ -10,7 +10,7 @@ use Exception;
/**
* Class Help
* @package Kiri\Kiri\Core
* @package Kiri\Core
*/
class Help
{
kiri-engine/Core/Json.php
+1 -1
View File
@@ -16,7 +16,7 @@ use Throwable;
/**
* Class JSON
* @package Kiri\Kiri\Core
* @package Kiri\Core
*/
class Json
{
kiri-engine/Core/Reader.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Kiri\Core;
/**
* Class Reader
* @package Kiri\Kiri\Core
* @package Kiri\Core
*/
class Reader
{
kiri-engine/Core/Str.php
+1 -1
View File
@@ -9,7 +9,7 @@ use Exception;
/**
* Class Str
* @package Kiri\Kiri\Core
* @package Kiri\Core
*/
class Str
{
kiri-engine/Core/Xml.php
+1 -1
View File
@@ -13,7 +13,7 @@ use Exception;
/**
* Class Xml
* @package Kiri\Kiri\Core
* @package Kiri\Core
*/
class Xml
{
kiri-engine/Di/Container.php
+40 -35
View File
@@ -9,18 +9,19 @@ declare(strict_types=1);
namespace Kiri\Di;
use Kiri\Annotation\Inject;
use Closure;
use Exception;
use Kiri;
use Kiri\Abstracts\Logger;
use Kiri\Kiri;
use Kiri\Annotation\Inject;
use Psr\Container\ContainerInterface;
use Psr\Log\LoggerInterface;
use ReflectionClass;
use ReflectionException;
use ReflectionFunction;
use ReflectionMethod;
use ReflectionProperty;
use Psr\Container\ContainerInterface;
use static;
/**
* Class Container
@@ -61,36 +62,40 @@ class Container implements ContainerInterface
];
/**
* @param string $id
* @return mixed
* @throws
*/
/**
* @param string $id
* @return mixed
* @throws
*/
public function get(string $id): mixed
{
if ($id == ContainerInterface::class) {
return $this;
}
return $this->make($id, [], []);
}
/**
* @param $class
* @param array $constrict
* @param array $config
* @return mixed
* @throws
*/
public function make($class, array $constrict = [], array $config = []): mixed
{
if ($this->isInterface($class)) {
$class = $this->_interfaces[$class];
}
if (!isset($this->_singletons[$class])) {
$this->_singletons[$class] = $this->resolve($class, $constrict, $config);
}
return $this->_singletons[$class];
}
/**
* @param $class
* @param array $constrict
* @param array $config
* @return mixed
* @throws
*/
public function make($class, array $constrict = [], array $config = []): mixed
{
if ($class == ContainerInterface::class) {
return $this;
}
if ($this->isInterface($class)) {
$class = $this->_interfaces[$class];
}
if (!isset($this->_singletons[$class])) {
$this->_singletons[$class] = $this->resolve($class, $constrict, $config);
}
return $this->_singletons[$class];
}
/**
@@ -439,12 +444,12 @@ class Container implements ContainerInterface
return $old;
}
/**
* @param string $id
* @return bool
*/
public function has(string $id): bool
{
return isset($this->_singletons[$id]) || isset($this->_interfaces[$id]);
}
/**
* @param string $id
* @return bool
*/
public function has(string $id): bool
{
return isset($this->_singletons[$id]) || isset($this->_interfaces[$id]);
}
}
kiri-engine/Di/LocalService.php
+1 -1
View File
@@ -3,7 +3,7 @@
namespace Kiri\Di;
use Kiri\Abstracts\Component;
use Kiri\Kiri;
use Kiri;
/**
kiri-engine/Environmental.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Kiri;
use JetBrains\PhpStorm\Pure;
use Kiri;
/**
* Class Environmental
kiri-engine/Error/ErrorHandler.php
+2 -2
View File
@@ -14,13 +14,13 @@ use Kiri\Message\Handler\Formatter\IFormatter;
use Kiri\Abstracts\Component;
use Kiri\Core\Json;
use Kiri\Events\EventDispatch;
use Kiri\Kiri;
use Kiri;
use Kiri\Message\Events\OnAfterRequest;
/**
* Class ErrorHandler
*
* @package Kiri\Kiri\Base
* @package Kiri\Base
* @property-read $asError
*/
class ErrorHandler extends Component implements ErrorInterface
kiri-engine/Error/ErrorInterface.php
+1 -1
View File
@@ -11,7 +11,7 @@ namespace Kiri\Error;
/**
* Interface ErrorInterface
* @package Kiri\Kiri\Error
* @package Kiri\Error
*/
interface ErrorInterface
{
kiri-engine/Error/Logger.php
+2 -2
View File
@@ -12,14 +12,14 @@ namespace Kiri\Error;
use Exception;
use Kiri\Abstracts\Component;
use Kiri\Core\Json;
use Kiri\Kiri;
use Kiri;
use Kiri\Annotation\Inject;
use Psr\Log\LoggerInterface;
use Throwable;
/**
* Class Logger
* @package Kiri\Kiri\Error
* @package Kiri\Error
* @mixin \Kiri\Abstracts\Logger
*/
class Logger extends Component
kiri-engine/Error/LoggerAspect.php
+1 -1
View File
@@ -8,7 +8,7 @@ use Exception;
use Kiri\Message\Aspect\OnAspectInterface;
use Kiri\Message\Aspect\OnJoinPointInterface;
use Kiri\Message\Constrict\RequestInterface;
use Kiri\Kiri;
use Kiri;
use Psr\Log\LoggerInterface;
kiri-engine/Error/LoggerProcess.php
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Kiri\Error;
use Exception;
use Kiri\Core\Json;
use Kiri\Exception\ComponentException;
use Kiri\Kiri;
use Kiri;
use Kiri\Server\Abstracts\BaseProcess;
use Kiri\Server\Broadcast\OnBroadcastInterface;
use Psr\Log\LoggerInterface;
kiri-engine/Event.php
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Kiri;
use Exception;
use Kiri\Abstracts\Component;
use Kiri;
/**
* Class Event
* @package Kiri
kiri-engine/Exception/ComponentException.php
+1 -1
View File
@@ -15,7 +15,7 @@ use Throwable;
/**
* Class ComponentException
* @package Kiri\Kiri\Exception
* @package Kiri\Exception
*/
class ComponentException extends \Exception
{
kiri-engine/Exception/NotFindClassException.php
+1 -1
View File
@@ -16,7 +16,7 @@ use Throwable;
/**
* Class NotFindClassException
* @package Kiri\Kiri\Exception
* @package Kiri\Exception
*/
class NotFindClassException extends \Exception
{
kiri-engine/Exception/NotFindPropertyException.php
+1 -1
View File
@@ -15,7 +15,7 @@ use Throwable;
/**
* Class NotFindClassException
* @package Kiri\Kiri\Exception
* @package Kiri\Exception
*/
class NotFindPropertyException extends \Exception
{
kiri-engine/FileListen/HotReload.php
+1 -1
View File
@@ -7,7 +7,7 @@ use Kiri\Abstracts\Config;
use Kiri\Core\Json;
use Kiri\Error\Logger;
use Kiri\Exception\ConfigException;
use Kiri\Kiri;
use Kiri;
use Kiri\Annotation\Inject;
use Swoole\Coroutine;
use Swoole\Process;
kiri-engine/Pool/Connection.php
+1 -1
View File
@@ -9,7 +9,7 @@ use Exception;
use Kiri\Abstracts\Component;
use Kiri\Abstracts\Config;
use Kiri\Context;
use Kiri\Kiri;
use Kiri;
use Swoole\Error;
use Throwable;
kiri-engine/Pool/Redis.php
+2 -2
View File
@@ -10,11 +10,11 @@ use Exception;
use Kiri\Abstracts\Component;
use Kiri\Context;
use Kiri\Exception\ConfigException;
use Kiri\Kiri;
use Kiri;
/**
* Class RedisClient
* @package Kiri\Kiri\Pool
* @package Kiri\Pool
*/
class Redis extends Component
{
kiri-engine/Runtime.php
+1 -1
View File
@@ -10,7 +10,7 @@ use Kiri\Abstracts\Input;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Kiri;
/**
* Class Runtime
kiri-gii/Gii.php
+1 -1
View File
@@ -13,7 +13,7 @@ use Database\Connection;
use Database\Db;
use Exception;
use Kiri\Cache\Redis;
use Kiri\Kiri;
use Kiri;
use Symfony\Component\Console\Input\InputInterface;
/**
kiri-gii/GiiCommand.php
+1 -1
View File
@@ -7,7 +7,7 @@ namespace Gii;
use Exception;
use Kiri\Abstracts\Config;
use Kiri\Exception\ConfigException;
use Kiri\Kiri;
use Kiri;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
kiri-gii/GiiController.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Gii;
use Exception;
use ReflectionException;
use Kiri\Kiri;
use Kiri;
/**
* Class GiiController
kiri-gii/GiiMiddleware.php
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Gii;
use Exception;
use Kiri\Kiri;
use Kiri;
/**
* Class GiiMiddleware
kiri-gii/GiiModel.php
+1 -1
View File
@@ -8,7 +8,7 @@ use Database\Db;
use Database\Model;
use Exception;
use ReflectionException;
use Kiri\Kiri;
use Kiri;
/**
* Class GiiModel
kiri-gii/GiiProviders.php
+1 -1
View File
@@ -8,7 +8,7 @@ namespace Gii;
use Exception;
use Kiri\Abstracts\Providers;
use Kiri\Application;
use Kiri\Kiri;
use Kiri;
/**
* Class DatabasesProviders
kiri-gii/GiiRpcClient.php
+2 -2
View File
@@ -5,7 +5,7 @@ namespace Gii;
use Exception;
use Kiri\Kiri;
use Kiri;
/**
* Class GiiRpcClient
@@ -42,7 +42,7 @@ use Kiri\Annotation\Target;
use Exception;
use Rpc\Client;
use Kiri\Core\Json;
use Kiri\Kiri;
use Kiri;
';
kiri-gii/GiiRpcService.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace Gii;
use Exception;
use Kiri\Kiri;
use Kiri;
/**
* Class GiiRpcClient
kiri-gii/GiiTask.php
+1 -1
View File
@@ -5,7 +5,7 @@ declare(strict_types=1);
namespace Gii;
use Exception;
use Kiri\Kiri;
use Kiri;
/**
* Class GiiModel
kiri-websocket-server/Sender.php
+1 -1
View File
@@ -2,7 +2,7 @@
namespace Kiri\Websocket;
use Kiri\Kiri;
use Kiri;
use Swoole\{Coroutine\Http\Server as AliasServer, WebSocket\Server};