eee

ReturnTypeWillChange.php

@@ -1,16 +1,15 @@
 <?php
 
-if (class_exists('\ReturnTypeWillChange')) {
+if (!class_exists('\ReturnTypeWillChange')) {
-	return;
+    #[\Attribute(\Attribute::TARGET_METHOD)]
+    final class ReturnTypeWillChange
+    {
+
+
+        public function __construct()
+        {
+        }
+
+    }
 }
 
-#[\Attribute(\Attribute::TARGET_METHOD)]
-final class ReturnTypeWillChange
-{
-
-
-	public function __construct()
-	{
-	}
-
-}

composer.json

@@ -21,6 +21,8 @@
     "ext-xml": "*",
     "ext-curl": "*",
     "ext-openssl": "*",
+    "ext-swoole": "*",
+    "ext-msgpack": "*",
     "symfony/console": "~v5.3.10",
     "psr/log": "1.*",
     "composer-runtime-api": "^2.0",

kiri-engine/Abstracts/BaseApplication.php

@@ -23,8 +23,6 @@ use Psr\Container\NotFoundExceptionInterface;
 use Psr\Log\LoggerInterface;
 use Kiri\Events\EventProvider;
 use ReflectionException;
-use Monolog\Logger;
-use Kiri\Pool\{Pool, PoolInterface};
 use Kiri\Error\StdoutLogger;
 
 /**
@@ -67,7 +65,7 @@ abstract class BaseApplication extends Component
      */
     public function __construct()
     {
-        $this->container = Kiri::getContainer();
+        $this->container    = Kiri::getContainer();
         $this->localService = $this->container->get(LocalService::class);
 
         $this->provider = $this->container->get(EventProvider::class);
@@ -82,8 +80,6 @@ abstract class BaseApplication extends Component
     }
 
 
-    const LOGGER_LEVELS = [Logger::EMERGENCY, Logger::ALERT, Logger::CRITICAL, Logger::ERROR, Logger::WARNING, Logger::NOTICE, Logger::INFO, Logger::DEBUG];
-
     /**
      * @param ConfigProvider $config
      * @return void

kiri-engine/Abstracts/Component.php

@@ -13,6 +13,7 @@ namespace Kiri\Abstracts;
 use Exception;
 use JetBrains\PhpStorm\Pure;
 use Kiri;
+use ReflectionException;
 
 /**
  * Class Component
@@ -49,7 +50,7 @@ class Component implements Configure
 
     /**
      * @return Kiri\Error\StdoutLogger
-     * @throws \ReflectionException
+     * @throws ReflectionException
      */
     public function getLogger(): Kiri\Error\StdoutLogger
     {

kiri-engine/Core/DateFormat.php

@@ -94,8 +94,8 @@ class DateFormat
 	 * @param null $endTime
 	 * @return string
 	 */
-	public static function mtime($startTime, $endTime = null)
+	public static function mtime($startTime, $endTime = null): string
-	{
+    {
 		if ($endTime === null) {
 			$endTime = microtime(true);
 		}

kiri-engine/Core/HashMap.php

@@ -138,7 +138,12 @@ class HashMap implements \ArrayAccess, \IteratorAggregate
     }
 
 
-    public static function Tree(HashMap $root, string $leaf)
+    /**
+     * @param HashMap $root
+     * @param string $leaf
+     * @return HashMap
+     */
+    public static function Tree(HashMap $root, string $leaf): HashMap
     {
         if ($root->has($leaf)) {
             $hashMap = $root->get($leaf);

kiri-engine/Core/Help.php

@@ -6,6 +6,8 @@ namespace Kiri\Core;
 
 
 use Exception;
+use Swift_Message;
+use Swift_SmtpTransport;
 
 
 /**
@@ -114,11 +116,8 @@ class Help
 	public static function toString($parameter): bool|array|string
 	{
 		if (!is_string($parameter)) {
-			$parameter = ArrayAccess::toArray($parameter);
+            $parameter = Json::encode(ArrayAccess::toArray($parameter));
-			if (is_array($parameter)) {
+        }
-				$parameter = Json::encode($parameter);
-			}
-		}
 		return $parameter;
 	}
 
@@ -152,7 +151,7 @@ class Help
 	 *
 	 * 随机字符串
 	 */
-	public static function random($length = 20): string
+	public static function random(int $length = 20): string
 	{
 		$res = [];
 		$str = 'abcdefghijklmnopqrstuvwxyz';
@@ -162,7 +161,7 @@ class Help
 			if (empty($rand)) {
 				$rand = substr($str, strlen($str) - 3, 1);
 			}
-			array_push($res, $rand);
+			$res[] = $rand;
 		}
 
 		return implode($res);
@@ -199,14 +198,14 @@ class Help
 	 * @param string $Subject
 	 * @param $messageContent
 	 */
-	public static function sendEmail($email, string $Subject, $messageContent)
+	public static function sendEmail($email, string $Subject, $messageContent): void
-	{
+    {
 		if (!class_exists('\Swift_Mailer')) {
 			return;
 		}
-		$mailer = new \Swift_Mailer((new \Swift_SmtpTransport($email['host'], $email['port']))
+		$mailer = new \Swift_Mailer((new Swift_SmtpTransport($email['host'], $email['port']))
 			->setUsername($email['username'])->setPassword($email['password']));
-		$message = (new \Swift_Message($Subject))
+		$message = (new Swift_Message($Subject))
 			->setFrom([$email['send']['address'] => $email['send']['nickname']])
 			->setBody('Here is the message itself');
 

kiri-engine/Core/Str.php

@@ -45,7 +45,7 @@ class Str
      */
     public static function random(int $length = 20): int|string
     {
-        $number = '';
+        $number  = '';
         $default = str_split(self::NUMBER);
         if ($length < 1) $length = 1;
         for ($i = 0; $i < $length; $i++) {
@@ -157,7 +157,7 @@ class Str
         asort($array);
         $str = implode('', $array);
         for ($i = 0; $i < $number; $i++) {
-            $_tmp = md5($key) . md5($str) . mb_substr($add, $len, $len + 5, 'utf-8');
+            $_tmp  = md5($key) . md5($str) . mb_substr($add, $len, $len + 5, 'utf-8');
             $res[] = md5($_tmp);
         }
         sort($res, SORT_STRING);
@@ -171,17 +171,12 @@ class Str
      */
     public static function filename($file, $type): string
     {
-        switch ($type) {
+        return match ($type) {
-            case 'image/png':
+            'image/png' => md5_file($file) . '.png',
-                return md5_file($file) . '.png';
+            'image/jpeg', 'image/jpg' => md5_file($file) . '.jpg',
-            case 'image/jpeg':
+            'image/gif' => md5_file($file) . '.gif',
-            case 'image/jpg':
+            default => md5_file($file),
-                return md5_file($file) . '.jpg';
+        };
-            case 'image/gif':
-                return md5_file($file) . '.gif';
-                break;
-        }
-        return md5_file($file);
     }
 
     /**

kiri-engine/Error/ErrorHandler.php

@@ -95,8 +95,6 @@ class ErrorHandler extends Component implements ErrorInterface
 
     /**
      * @return void
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
      * @throws ReflectionException
      * @throws Exception
      */
@@ -114,8 +112,6 @@ class ErrorHandler extends Component implements ErrorInterface
     /**
      * @param Throwable $exception
      *
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
      * @throws Exception
      */
     public function exceptionHandler(Throwable $exception): void
@@ -130,8 +126,6 @@ class ErrorHandler extends Component implements ErrorInterface
 
     /**
      * @throws ErrorException
-     * @throws ContainerExceptionInterface
-     * @throws NotFoundExceptionInterface
      * @throws ReflectionException
      */
     public function errorHandler()

kiri-engine/Events/OnAfterCommandExecute.php

@@ -8,9 +8,9 @@ class OnAfterCommandExecute
 {
 
 
-	/**
+    /**
-	 *
+     * @param Command $command
-	 */
+     */
 	public function __construct(public Command $command)
 	{
 	}

kiri-engine/Redis/Redis.php

@@ -13,7 +13,6 @@ use Exception;
 use Kiri;
 use Kiri\Exception\RedisConnectException;
 use Kiri\Pool\Pool;
-use Kiri\Server\Events\OnWorkerExit;
 
 /**
  * Class Redis