Revert "改名"

This reverts commit fdf58326

kiri-engine/Abstracts/BaseApplication.php

@@ -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

@@ -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

@@ -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

@@ -10,7 +10,7 @@ namespace Kiri\Abstracts;
 
 /**
  * Interface Configure
- * @package Kiri\Kiri\Base
+ * @package Kiri\Base
  */
 interface Configure
 {

kiri-engine/Abstracts/Logger.php

@@ -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

@@ -29,6 +29,8 @@ use Symfony\Component\Console\{Application as ConsoleApplication,
 	Output\ConsoleOutput,
 	Output\OutputInterface
 };
+use Kiri;
+
 
 /**
  * Class Init

kiri-engine/Async.php

@@ -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

@@ -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

@@ -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

@@ -11,7 +11,7 @@ namespace Kiri\Cache;
 
 /**
  * Interface ICache
- * @package Kiri\Kiri\Cache
+ * @package Kiri\Cache
  */
 interface ICache
 {

kiri-engine/Cache/Redis.php

@@ -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

@@ -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

@@ -13,7 +13,7 @@ namespace Kiri\Core;
 
 /**
  * Class DateFormat
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class DateFormat
 {

kiri-engine/Core/Help.php

@@ -10,7 +10,7 @@ use Exception;
 
 /**
  * Class Help
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Help
 {

kiri-engine/Core/Json.php

@@ -16,7 +16,7 @@ use Throwable;
 
 /**
  * Class JSON
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Json
 {

kiri-engine/Core/Reader.php

@@ -6,7 +6,7 @@ namespace Kiri\Core;
 
 /**
  * Class Reader
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Reader
 {

kiri-engine/Core/Str.php

@@ -9,7 +9,7 @@ use Exception;
 
 /**
  * Class Str
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Str
 {

kiri-engine/Core/Xml.php

@@ -13,7 +13,7 @@ use Exception;
 
 /**
  * Class Xml
- * @package Kiri\Kiri\Core
+ * @package Kiri\Core
  */
 class Xml
 {

kiri-engine/Di/Container.php

@@ -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

@@ -3,7 +3,7 @@
 namespace Kiri\Di;
 
 use Kiri\Abstracts\Component;
-use Kiri\Kiri;
+use Kiri;
 
 
 /**

kiri-engine/Environmental.php

@@ -5,7 +5,7 @@ namespace Kiri;
 
 
 use JetBrains\PhpStorm\Pure;
-
+use Kiri;
 
 /**
  * Class Environmental

kiri-engine/Error/ErrorHandler.php

@@ -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

@@ -11,7 +11,7 @@ namespace Kiri\Error;
 
 /**
  * Interface ErrorInterface
- * @package Kiri\Kiri\Error
+ * @package Kiri\Error
  */
 interface ErrorInterface
 {

kiri-engine/Error/Logger.php

@@ -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

@@ -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

@@ -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

@@ -7,7 +7,7 @@ namespace Kiri;
 
 use Exception;
 use Kiri\Abstracts\Component;
-
+use Kiri;
 /**
  * Class Event
  * @package Kiri

kiri-engine/Exception/ComponentException.php

@@ -15,7 +15,7 @@ use Throwable;
 
 /**
  * Class ComponentException
- * @package Kiri\Kiri\Exception
+ * @package Kiri\Exception
  */
 class ComponentException extends \Exception
 {

kiri-engine/Exception/NotFindClassException.php

@@ -16,7 +16,7 @@ use Throwable;
 
 /**
  * Class NotFindClassException
- * @package Kiri\Kiri\Exception
+ * @package Kiri\Exception
  */
 class NotFindClassException extends \Exception
 {

kiri-engine/Exception/NotFindPropertyException.php

@@ -15,7 +15,7 @@ use Throwable;
 
 /**
  * Class NotFindClassException
- * @package Kiri\Kiri\Exception
+ * @package Kiri\Exception
  */
 class NotFindPropertyException extends \Exception
 {

kiri-engine/FileListen/HotReload.php

@@ -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/Kiri.php

@@ -1,636 +0,0 @@
-<?php
-declare(strict_types=1);
-
-
-namespace Kiri;
-
-error_reporting(0);
-
-
-use Kiri\Annotation\Annotation;
-use Database\Collection;
-use Database\ModelInterface;
-use Exception;
-use JetBrains\PhpStorm\Pure;
-use Kiri\Abstracts\Config;
-use Kiri\Core\Json;
-use Kiri\Di\Container;
-use Psr\Container\ContainerInterface;
-use ReflectionException;
-use Kiri\Server\ServerManager;
-use Kiri\Server\Tasker\AsyncTaskExecute;
-use Swoole\Coroutine;
-use Swoole\Process;
-use Swoole\WebSocket\Server;
-
-
-defined('DB_ERROR_BUSY') or define('DB_ERROR_BUSY', 'The database is busy. Please try again later.');
-defined('SELECT_IS_NULL') or define('SELECT_IS_NULL', 'Query data does not exist, please check the relevant conditions.');
-defined('PARAMS_IS_NULL') or define('PARAMS_IS_NULL', 'Required items cannot be empty, please add.');
-defined('CONTROLLER_PATH') or define('CONTROLLER_PATH', APP_PATH . 'app/Controllers/');
-defined('CRONTAB_PATH') or define('CRONTAB_PATH', APP_PATH . 'app/Crontab/');
-defined('CLIENT_PATH') or define('CLIENT_PATH', APP_PATH . 'app/Client/');
-defined('TASK_PATH') or define('TASK_PATH', APP_PATH . 'app/Async/');
-defined('LISTENER_PATH') or define('LISTENER_PATH', APP_PATH . 'app/Listener/');
-defined('KAFKA_PATH') or define('KAFKA_PATH', APP_PATH . 'app/Kafka/');
-defined('RPC_CLIENT_PATH') or define('RPC_CLIENT_PATH', APP_PATH . 'app/Client/Rpc/');
-defined('MODEL_PATH') or define('MODEL_PATH', APP_PATH . 'app/Model/');
-
-
-/**
- * Class Kiri
- * @package Kiri
- */
-class Kiri
-{
-
-	/** @var Container */
-	private static Container $container;
-
-
-	/** @var ?Application */
-	private static ?Application $service = null;
-
-
-	/**
-	 * @param $service
-	 *
-	 * 初始化服务
-	 */
-	public static function init($service)
-	{
-		static::$service = $service;
-	}
-
-
-	/**
-	 * @param Container $container
-	 */
-	public static function setContainer(Container $container)
-	{
-		$container->setBindings(ContainerInterface::class, $container);
-		static::$container = $container;
-	}
-
-
-	/**
-	 * @param $alias
-	 * @param array $array
-	 * @throws Exception
-	 */
-	public static function set($alias, array $array = [])
-	{
-		static::app()->set($alias, $array);
-	}
-
-
-	/**
-	 * @param string $name
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function getApp(string $name): mixed
-	{
-		return static::app()->get($name);
-	}
-
-	/**
-	 * @return Application|null
-	 */
-	public static function app(): ?Application
-	{
-		return static::$service;
-	}
-
-
-	/**
-	 * @return Application|null
-	 */
-	public static function getFactory(): ?Application
-	{
-		return static::$service;
-	}
-
-
-	/**
-	 * @return Application|null
-	 */
-	public static function getApplicationContext(): ?Application
-	{
-		return static::$service;
-	}
-
-
-	/**
-	 * @return Container|null
-	 */
-	public static function getContainerContext(): ?Container
-	{
-		return static::$container;
-	}
-
-	/**
-	 * @param $name
-	 * @return bool
-	 */
-	public static function has($name): bool
-	{
-		return static::$service->has($name);
-	}
-
-
-	/**
-	 * @param $port
-	 * @return bool
-	 * @throws Exception
-	 */
-	public static function port_already($port): bool
-	{
-		if (empty($port)) {
-			return false;
-		}
-		if (Kiri::getPlatform()->isLinux()) {
-			exec('netstat -tunlp | grep ' . $port, $output);
-		} else {
-			exec('lsof -i :' . $port . ' | grep -i "LISTEN"', $output);
-		}
-		return !empty($output);
-	}
-
-
-	/**
-	 * @return Annotation
-	 * @throws Exception
-	 */
-	public static function getAnnotation(): Annotation
-	{
-		return static::app()->getAnnotation();
-	}
-
-
-	/**
-	 * @param $service
-	 * @return string
-	 */
-	#[Pure] public static function listen($service): string
-	{
-		return sprintf('Check listen %s::%d -> ok', $service['host'], $service['port']);
-	}
-
-
-	/**
-	 * @param $className
-	 * @param array $construct
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function createObject($className, array $construct = []): mixed
-	{
-		if (is_string($className) && class_exists($className)) {
-			return static::$container->get($className, $construct);
-		} else if (is_array($className) && isset($className['class'])) {
-			$class = $className['class'];
-			unset($className['class']);
-			return static::$container->create($class, $construct, $className);
-		} else if (is_callable($className, TRUE)) {
-			return call_user_func($className, $construct);
-		} else {
-			throw new Exception('Unsupported configuration type: ' . gettype($className));
-		}
-	}
-
-	/**
-	 * @return string
-	 * @throws Exception
-	 */
-	public static function getStoragePath(): string
-	{
-		$default = APP_PATH . 'storage' . DIRECTORY_SEPARATOR;
-		$path = Config::get('storage', $default);
-		if (!is_dir($path)) {
-			mkdir($path, 0777, true);
-		}
-		return $path;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public static function inCoroutine(): bool
-	{
-		return Coroutine::getCid() > 0;
-	}
-
-
-	/**
-	 * @return Container
-	 */
-	public static function getDi(): Container
-	{
-		return static::$container;
-	}
-
-
-	/**
-	 * @return Container
-	 */
-	public static function di(): Container
-	{
-		return static::$container;
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setManagerId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/manager');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setProcessId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/process');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	public static function isDocker(): bool
-	{
-		$output = shell_exec('[ -f /.dockerenv ] && echo yes || echo no');
-		if (trim($output) === 'yes') {
-			return true;
-		}
-		return false;
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setWorkerId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/worker');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function setTaskId($workerId): mixed
-	{
-		if (empty($workerId) || static::isDocker()) {
-			return $workerId;
-		}
-
-		$tmpFile = storage($workerId . '.sock', 'pid/task');
-
-		return self::writeFile($tmpFile, $workerId);
-	}
-
-	/**
-	 * @param $fileName
-	 * @param $content
-	 * @param null $is_append
-	 * @return mixed
-	 */
-	public static function writeFile($fileName, $content, $is_append = null): mixed
-	{
-		$params = [$fileName, (string)$content];
-		if ($is_append !== null) {
-			$params[] = $is_append;
-		}
-		return !self::inCoroutine() ? file_put_contents(...$params) : Coroutine::writeFile(...$params);
-	}
-
-
-	/**
-	 * @param $object
-	 * @param $config
-	 * @return mixed
-	 */
-	public static function configure($object, $config): mixed
-	{
-		foreach ($config as $key => $value) {
-			if (!property_exists($object, $key)) {
-				continue;
-			}
-			$object->$key = $value;
-		}
-		return $object;
-	}
-
-
-	/**
-	 * @param $workerId
-	 * @param bool $isWorker
-	 * @throws Exception
-	 */
-	public static function clearProcessId($workerId, bool $isWorker = false)
-	{
-		clearstatcache();
-		$directory = $isWorker === true ? 'pid/worker' : 'pid/task';
-		if (!file_exists($file = storage($workerId, $directory))) {
-			return;
-		}
-		shell_exec('rm -rf ' . $file);
-	}
-
-
-	/**
-	 * @param string|null $taskPid
-	 * @throws Exception
-	 */
-	public static function clearTaskPid(string $taskPid = null)
-	{
-		if (empty($taskPid)) {
-			exec('rm -rf ' . storage(null, 'pid/task'));
-		} else {
-			static::clearProcessId($taskPid);
-		}
-	}
-
-
-	/**
-	 * @param $taskPid
-	 * @throws Exception
-	 */
-	public static function clearWorkerPid($taskPid = null)
-	{
-		if (empty($taskPid)) {
-			exec('rm -rf ' . storage(null, 'pid/worker'));
-		} else {
-			static::clearProcessId($taskPid, true);
-		}
-	}
-
-
-	/**
-	 * @return Server|null
-	 * @throws
-	 */
-	public static function getWebSocket(): ?\Swoole\Server
-	{
-		$server = static::app()->getSwoole();
-		if (!($server instanceof \Swoole\Server)) {
-			return null;
-		}
-		return $server;
-	}
-
-
-	/**
-	 * @return false|string
-	 * @throws Exception
-	 */
-	public static function getMasterPid(): bool|string
-	{
-		$pid = Kiri::app()->getSwoole()->setting['pid_file'];
-
-		return file_get_contents($pid);
-	}
-
-
-	/**
-	 * @param int $fd
-	 * @param $data
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function push(int $fd, $data): mixed
-	{
-		$server = static::getWebSocket();
-		if (empty($server) || !$server->isEstablished($fd)) {
-			return false;
-		}
-		if (!is_string($data)) {
-			$data = Json::encode($data);
-		}
-		return $server->push($fd, $data);
-	}
-
-
-	/**
-	 * @return mixed
-	 */
-	public static function localhost(): mixed
-	{
-		return current(swoole_get_local_ip());
-	}
-
-
-	/**
-	 * @param string $class
-	 * @param array $params
-	 * @throws ReflectionException
-	 * @throws Exception
-	 */
-	public static function async(string $class, array $params = [])
-	{
-		$manager = di(AsyncTaskExecute::class);
-		$manager->execute(new $class(...$params));
-	}
-
-
-	/**
-	 * @param array $v1
-	 * @param array $v2
-	 * @return float
-	 */
-	#[Pure] public static function distance(array $v1, array $v2): float
-	{
-		$maxX = max($v1['x'], $v2['x']);
-		$minX = min($v1['x'], $v2['x']);
-
-		$maxZ = max($v1['z'], $v2['z']);
-		$minZ = min($v1['z'], $v2['z']);
-
-		$dx = abs($maxX - $minX);
-		$dy = abs($maxZ - $minZ);
-
-		$sqrt = sqrt($dx * $dx + $dy * $dy);
-		if ($sqrt < 0) {
-			$sqrt = abs($sqrt);
-		}
-		return (float)$sqrt;
-	}
-
-
-	/**
-	 * @param $process
-	 * @throws Exception
-	 */
-	public static function shutdown($process): void
-	{
-		static::app()->getSwoole()->shutdown();
-		if ($process instanceof Process) {
-			$process->exit(0);
-		}
-	}
-
-
-	/**
-	 * @param $tmp_name
-	 * @return string
-	 */
-	public static function rename($tmp_name): string
-	{
-		$hash = md5_file($tmp_name);
-
-		$later = '.' . exif_imagetype($tmp_name);
-
-		$match = '/(\w{12})(\w{5})(\w{9})(\w{6})/';
-		$tmp = preg_replace($match, '$1-$2-$3-$4', $hash);
-
-		return strtoupper($tmp) . $later;
-	}
-
-
-	/**
-	 * @return Environmental
-	 * @throws
-	 */
-	public static function getPlatform(): Environmental
-	{
-		return Kiri::createObject(Environmental::class);
-	}
-
-
-	/**
-	 * @return mixed
-	 * @throws Exception
-	 */
-	public static function reload(): mixed
-	{
-		return Kiri::app()->getSwoole()->reload();
-	}
-
-
-	private static array $_autoload = [];
-
-
-	const PROCESS = 'process';
-	const TASK = 'task';
-	const WORKER = 'worker';
-
-
-	/**
-	 * @param string $event
-	 * @param null $data
-	 * @return false|string
-	 * @throws Exception
-	 */
-	public static function param(string $event, $data = NULL): bool|string
-	{
-		if (is_object($data)) {
-			if ($data instanceof ModelInterface || $data instanceof Collection) {
-				$data = $data->getAttributes();
-			} else {
-				$data = get_object_vars($data);
-			}
-		}
-		if (!is_array($data)) $data = ['data' => $data];
-		return json_encode(array_merge(['callback' => $event], $data));
-	}
-
-
-	/**
-	 * @return string|null
-	 */
-	#[Pure] public static function getEnvironmental(): ?string
-	{
-		return env('environmental');
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	#[Pure] public static function isTask(): bool
-	{
-		return static::getEnvironmental() == static::TASK;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	#[Pure] public static function isWorker(): bool
-	{
-		return static::getEnvironmental() == static::WORKER;
-	}
-
-
-	/**
-	 * @return bool
-	 */
-	#[Pure] public static function isProcess(): bool
-	{
-		return static::getEnvironmental() == static::PROCESS;
-	}
-
-
-	/**
-	 * @param $class
-	 * @param $file
-	 */
-	public static function setAutoload($class, $file)
-	{
-		if (isset(static::$_autoload[$class])) {
-			return;
-		}
-		static::$_autoload[$class] = $file;
-		include_once "Kiri.php";
-	}
-
-
-	/**
-	 * @param $className
-	 */
-	public static function autoload($className)
-	{
-		if (!isset(static::$_autoload[$className])) {
-			return;
-		}
-		$file = static::$_autoload[$className];
-		require_once "Kiri.php";
-	}
-
-
-}
-
-//spl_autoload_register([Kiri::class, 'autoload'], true, true);
-Kiri::setContainer(new Container());

kiri-engine/Pool/Connection.php

@@ -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

@@ -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

@@ -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