fix: update

refs: #70
phper666 · Feb 2, 2024 · abbb142 · abbb142
1 parent a6dc955
commit abbb142
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/src/Functions.php b/src/Functions.php
@@ -9,17 +9,28 @@
 
 namespace Phper666\JWTAuth;
 
-use Hyperf\Context\ApplicationContext;
-
-function hyperf_make(string $name, array $parameters = [])
-{
-    if (ApplicationContext::hasContainer()) {
-        /** @var \Hyperf\Di\Container $container */
-        $container = ApplicationContext::getContainer();
-        if (method_exists($container, 'make')) {
-            return $container->make($name, $parameters);
+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);
     }
-    $parameters = array_values($parameters);
-    return new $name(...$parameters);
 }
diff --git a/src/JWT.php b/src/JWT.php
@@ -88,7 +88,7 @@ class JWT extends AbstractJWT
 
     public function __construct()
     {
-        $config = hyperf_make(ConfigInterface::class);
+        $config = make(ConfigInterface::class);
         $jwtConfig = $config->get(JWTConstant::CONFIG_NAME, []);
         $scenes = $jwtConfig['scene'];
         foreach ($scenes as $key => $scene) {
@@ -98,9 +98,9 @@ public function __construct()
         }
 
         $this->jwtConfig = $config->get(JWTConstant::CONFIG_NAME, []);
-        $this->cache = hyperf_make(CacheInterface::class);
-        $this->request = hyperf_make(RequestInterface::class);
-        $this->pathMatch = hyperf_make(PathMatch::class);
+        $this->cache = make(CacheInterface::class);
+        $this->request = make(RequestInterface::class);
+        $this->pathMatch = make(PathMatch::class);
     }
 
     /**