Merge pull request #71 from phper666/70-call-to-undefined-function-ph…

…per666jwtauthmake

70 call to undefined function phper666jwtauthmake

composer.json

@@ -18,7 +18,10 @@
     "autoload": {
         "psr-4": {
             "Phper666\\JWTAuth\\": "src/"
-        }
+        },
+        "files": [
+            "src/Functions.php"
+        ]
     },
     "autoload-dev": {},
     "require": {

src/AbstractJWT.php

@@ -52,9 +52,9 @@ abstract function matchRoute(string $scene, string $requestMethod, string $reque
      * 获取jwt中的场景值
      *
      * @param string $token
-     * @return bool
+     * @return mixed
      */
-    abstract function getSceneByToken(string $token): bool;
+    abstract function getSceneByToken(string $token): array;
 
     /**
      * 刷新jwt token

src/Functions.php

@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+/**
+ * Created by PhpStorm.
+ * User: liyuzhao
+ * Date: 2024/2/2
+ * Time: 20:01
+ */
+
+namespace Phper666\JWTAuth;
+
+if (!function_exists('make')) {
+    function make(string $name, array $parameters = [])
+    {
+        if (class_exists('\Hyperf\Context\ApplicationContext')) {
+            if (\Hyperf\Context\ApplicationContext::hasContainer()) {
+                /** @var \Hyperf\Di\Container $container */
+                $container = \Hyperf\Context\ApplicationContext::getContainer();
+                if (method_exists($container, 'make')) {
+                    return $container->make($name, $parameters);
+                }
+            }
+        } elseif (class_exists('\Hyperf\Utils\ApplicationContext')) {
+            if (\Hyperf\Utils\ApplicationContext::hasContainer()) {
+                /** @var \Hyperf\Di\Container $container */
+                $container = \Hyperf\Utils\ApplicationContext::getContainer();
+                if (method_exists($container, 'make')) {
+                    return $container->make($name, $parameters);
+                }
+            }
+        }
+
+        $parameters = array_values($parameters);
+        return new $name(...$parameters);
+    }
+}

src/JWT.php

@@ -196,7 +196,7 @@ public function getToken(string $scene, array $claims): Plain
      *
      * @return mixed
      */
-    public function getJwtSceneConfig(string $scene = null) {
+    public function getJwtSceneConfig(string $scene = null): array {
         if ($scene == null) {
             return $this->jwtConfig[$this->getScene()];
         }
@@ -501,10 +501,11 @@ public function getTTL(string $token): int
         return (int)$sceneConfig['ttl'];
     }
 
-    public function getSceneByToken(string $token): bool
+    public function getSceneByToken(string $token): array
     {
         if($token == null) {
             $token = JWTUtil::getToken($this->request);
+            if (!$token) return [];
         }
         $token = $this->tokenToPlain($token);
         $scene = $this->getSceneByTokenPlain($token);
@@ -572,7 +573,7 @@ protected function validationConstraints(DataSet $claims, Configuration $configu
      * 通过token获取当前场景的配置
      *
      * @param Plain $token
-     * @return string
+     * @return array
      */
     protected function getSceneConfigByToken(Plain $token): array
     {

src/Util/JWTUtil.php

@@ -25,7 +25,7 @@ class JWTUtil
      * @param $claims
      * @return mixed
      */
-    public static function claimsToArray(DataSet $claims)
+    public static function claimsToArray(DataSet $claims): array
     {
         return $claims->all();
     }
@@ -38,16 +38,15 @@ public static function claimsToArray(DataSet $claims)
     public static function getToken(ServerRequestInterface $request)
     {
         $token = $request->getHeaderLine('Authorization') ?? '';
-        $token = self::handleToken($token);
-        return $token;
+        return self::handleToken($token);
     }
 
     /**
      * 解析token
      * @param ServerRequestInterface $request
      * @return array
      */
-    public static function getParserData(ServerRequestInterface $request)
+    public static function getParserData(ServerRequestInterface $request): array
     {
         $token = $request->getHeaderLine('Authorization') ?? '';
         $token = self::handleToken($token);