eee

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);
-			if (is_array($parameter)) {
-				$parameter = Json::encode($parameter);
-			}
-		}
+            $parameter = Json::encode(ArrayAccess::toArray($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) {
-            case 'image/png':
-                return md5_file($file) . '.png';
-            case 'image/jpeg':
-            case 'image/jpg':
-                return md5_file($file) . '.jpg';
-            case 'image/gif':
-                return md5_file($file) . '.gif';
-                break;
-        }
-        return md5_file($file);
+        return match ($type) {
+            'image/png' => md5_file($file) . '.png',
+            'image/jpeg', 'image/jpg' => md5_file($file) . '.jpg',
+            'image/gif' => md5_file($file) . '.gif',
+            default => md5_file($file),
+        };
     }
 
     /**