feat: thinkphp 框架 container 内置支持

phpstan.neon

@@ -1,5 +1,6 @@
 parameters:
     reportUnmatchedIgnoredErrors: false
-    excludePaths:
-        - src/Service/ContainerServiceProvider.php
     ignoreErrors:
+        - '#.* Illuminate\\Container\\Container.*#'
+        - '#.* Hyperf\\Utils\\ApplicationContext.*#'
+        - '#.* think\\Container.*#'

src/Pay.php

@@ -8,6 +8,7 @@
 use Illuminate\Container\Container as LaravelContainer;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
+use think\Container as ThinkPHPContainer;
 use Throwable;
 use Yansongda\Pay\Contract\ServiceProviderInterface;
 use Yansongda\Pay\Exception\ContainerException;
@@ -110,6 +111,8 @@ public static function config(array $config = [], $container = null): bool
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @param mixed $value
      *
      * @throws \Yansongda\Pay\Exception\ContainerException
@@ -119,24 +122,26 @@ public static function set(string $name, $value): void
         try {
             $container = Pay::getContainer();
 
-            if ($container instanceof LaravelContainer) { // @phpstan-ignore-line
-                $container->singleton($name, $value instanceof Closure ? $value : static fn () => $value); // @phpstan-ignore-line
-
-                return;
-            }
-
-            if (method_exists($container, 'set')) {
-                $container->set(...func_get_args());
-
-                return;
+            switch (true) {
+                case $container instanceof LaravelContainer:
+                    $container->singleton($name, $value instanceof Closure ? $value : static fn () => $value);
+                    break;
+                case $container instanceof ThinkPHPContainer:
+                    $container->delete($name);
+                    $container->bind($name, $value instanceof Closure ? $value : static fn () => $value);
+                    break;
+                default:
+                    if (!method_exists($container, 'set')) {
+                        throw new ContainerException('Current container does NOT support `set` method');
+                    }
+
+                    $container->set($name, $value);
             }
         } catch (ContainerNotFoundException $e) {
             throw $e;
         } catch (Throwable $e) {
             throw new ContainerException($e->getMessage());
         }
-
-        throw new ContainerException('Current container does NOT support `set` method');
     }
 
     /**
@@ -164,6 +169,8 @@ public static function make(string $service, array $parameters = [])
     }
 
     /**
+     * @codeCoverageIgnore
+     *
      * @return mixed
      *
      * @throws \Yansongda\Pay\Exception\ServiceNotFoundException
@@ -172,7 +179,15 @@ public static function make(string $service, array $parameters = [])
     public static function get(string $service)
     {
         try {
-            return Pay::getContainer()->get($service);
+            $container = Pay::getContainer();
+
+            // thinkphp 在 `get` 中必须是已经 bind 的，否则会报错，所以这里用其 make 替代
+            switch (true) {
+                case $container instanceof ThinkPHPContainer:
+                    return $container->make($service);
+                default:
+                    return $container->get($service);
+            }
         } catch (NotFoundExceptionInterface $e) {
             throw new ServiceNotFoundException($e->getMessage());
         } catch (ContainerNotFoundException $e) {

src/Provider/AbstractProvider.php

@@ -7,6 +7,7 @@
 use GuzzleHttp\Psr7\Utils;
 use Psr\Http\Client\ClientInterface;
 use Throwable;
+use Yansongda\Pay\Contract\ContainerInterface;
 use Yansongda\Pay\Contract\HttpClientInterface;
 use Yansongda\Pay\Contract\PluginInterface;
 use Yansongda\Pay\Contract\ProviderInterface;
@@ -53,6 +54,7 @@ public function call(string $plugin, array $params = [])
      *
      * @throws \Yansongda\Pay\Exception\ContainerException
      * @throws \Yansongda\Pay\Exception\InvalidParamsException
+     * @throws \Yansongda\Pay\Exception\ServiceNotFoundException
      */
     public function pay(array $plugins, array $params)
     {
@@ -63,7 +65,7 @@ public function pay(array $plugins, array $params)
         $this->verifyPlugin($plugins);
 
         /* @var Pipeline $pipeline */
-        $pipeline = Pay::make(Pipeline::class);
+        $pipeline = Pay::make(Pipeline::class, [Pay::get(ContainerInterface::class)]);
 
         /* @var Rocket $rocket */
         $rocket = $pipeline

src/Service/ContainerServiceProvider.php

@@ -7,20 +7,25 @@
 use Closure;
 use DI\ContainerBuilder;
 use Hyperf\Utils\ApplicationContext as HyperfApplication;
-use Illuminate\Container\Container as LaravelContainer;
+use Illuminate\Container\Container as LaravelApplication;
 use Psr\Container\ContainerInterface;
+use think\Container as ThinkPHPApplication;
 use Throwable;
 use Yansongda\Pay\Contract\ServiceProviderInterface;
 use Yansongda\Pay\Exception\ContainerException;
 use Yansongda\Pay\Exception\ContainerNotFoundException;
 use Yansongda\Pay\Exception\Exception;
 use Yansongda\Pay\Pay;
 
+/**
+ * @codeCoverageIgnore
+ */
 class ContainerServiceProvider implements ServiceProviderInterface
 {
     private $detectApplication = [
-        'laravel' => LaravelContainer::class,
+        'laravel' => LaravelApplication::class,
         'hyperf' => HyperfApplication::class,
+        'thinkphp' => ThinkPHPApplication::class,
     ];
 
     /**
@@ -55,12 +60,12 @@ public function register($data = null): void
      */
     protected function laravelApplication(): bool
     {
-        Pay::setContainer(static fn () => LaravelContainer::getInstance());
+        Pay::setContainer(static fn () => LaravelApplication::getInstance());
 
-        Pay::set(\Yansongda\Pay\Contract\ContainerInterface::class, LaravelContainer::getInstance());
+        Pay::set(\Yansongda\Pay\Contract\ContainerInterface::class, LaravelApplication::getInstance());
 
         if (!Pay::has(ContainerInterface::class)) {
-            Pay::set(ContainerInterface::class, LaravelContainer::getInstance());
+            Pay::set(ContainerInterface::class, LaravelApplication::getInstance());
         }
 
         return true;
@@ -81,7 +86,24 @@ protected function hyperfApplication(): bool
         Pay::set(\Yansongda\Pay\Contract\ContainerInterface::class, HyperfApplication::getContainer());
 
         if (!Pay::has(ContainerInterface::class)) {
-            Pay::set(ContainerInterface::class, HyperfApplication::getContainer());
+            Pay::set(ContainerInterface::class, HyperfApplication::getInstance());
+        }
+
+        return true;
+    }
+
+    /**
+     * @throws \Yansongda\Pay\Exception\ContainerException
+     * @throws \Yansongda\Pay\Exception\ContainerNotFoundException
+     */
+    protected function thinkphpApplication(): bool
+    {
+        Pay::setContainer(static fn () => ThinkPHPApplication::getInstance());
+
+        Pay::set(\Yansongda\Pay\Contract\ContainerInterface::class, ThinkPHPApplication::getInstance());
+
+        if (!Pay::has(ContainerInterface::class)) {
+            Pay::set(ContainerInterface::class, ThinkPHPApplication::getInstance());
         }
 
         return true;