merge from v3

yansongda · Jun 6, 2021 · 8f60e57 · 8f60e57
2 parents d08d153 + a434f12
commit 8f60e57
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/src/Functions.php b/src/Functions.php
@@ -10,11 +10,14 @@
 use Yansongda\Supports\Config;
 use Yansongda\Supports\Str;
 
-if (!function_exists('should_http_request')) {
-    function should_http_request(Rocket $rocket): bool
+if (!function_exists('should_do_http_request')) {
+    function should_do_http_request(Rocket $rocket): bool
     {
-        return NoHttpRequestParser::class !== $rocket->getDirection() &&
-            !in_array(NoHttpRequestParser::class, class_parents($rocket->getDirection()));
+        $direction = $rocket->getDirection();
+
+        return is_null($direction) ||
+            (NoHttpRequestParser::class !== $direction &&
+            !in_array(NoHttpRequestParser::class, class_parents($direction)));
     }
 }
 

diff --git a/src/Pay.php b/src/Pay.php
@@ -120,6 +120,8 @@ public static function config(array $config): Pay
      * @author yansongda <me@yansongda.cn>
      *
      * @param mixed $value
+     *
+     * @throws \Yansongda\Pay\Exception\ContainerException
      */
     public static function set(string $name, $value): void
     {
@@ -148,6 +150,9 @@ public static function get(string $service)
         }
     }
 
+    /**
+     * @throws \Yansongda\Pay\Exception\ContainerException
+     */
     public static function has(string $service): bool
     {
         return Pay::getContainer()->has($service);
@@ -157,10 +162,16 @@ public static function has(string $service): bool
      * getContainer.
      *
      * @author yansongda <me@yansongda.cn>
+     *
+     * @throws \Yansongda\Pay\Exception\ContainerException
      */
     public static function getContainer(): Container
     {
-        return self::$container;
+        if (self::$container) {
+            return self::$container;
+        }
+
+        throw new ContainerException('You should init/config PAY first', ContainerException::CONTAINER_NOT_FOUND);
     }
 
     /**

diff --git a/src/Plugin/Alipay/LaunchPlugin.php b/src/Plugin/Alipay/LaunchPlugin.php
@@ -24,7 +24,7 @@ public function assembly(Rocket $rocket, Closure $next): Rocket
         /* @var Rocket $rocket */
         $rocket = $next($rocket);
 
-        if (!should_http_request($rocket)) {
+        if (!should_do_http_request($rocket)) {
             return $rocket;
         }
 

diff --git a/src/Provider/AbstractProvider.php b/src/Provider/AbstractProvider.php
@@ -51,7 +51,7 @@ public function pay(array $plugins, array $params)
      */
     public function ignite(Rocket $rocket): Rocket
     {
-        if (!should_http_request($rocket)) {
+        if (!should_do_http_request($rocket)) {
             return $rocket;
         }