修复 GuzzleHttp\Client 超时时间设置问题 (overtrue#210)

zk910709 · Aug 1, 2019 · b2e7d5b · b2e7d5b
1 parent 25140e0
commit b2e7d5b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/EasySms.php b/src/EasySms.php
@@ -17,6 +17,7 @@
 use Overtrue\EasySms\Contracts\PhoneNumberInterface;
 use Overtrue\EasySms\Contracts\StrategyInterface;
 use Overtrue\EasySms\Exceptions\InvalidArgumentException;
+use Overtrue\EasySms\Gateways\Gateway;
 use Overtrue\EasySms\Strategies\OrderStrategy;
 use Overtrue\EasySms\Support\Config;
 use RuntimeException;
@@ -223,7 +224,13 @@ protected function createGateway($name)
             $gateway = $this->callCustomCreator($name);
         } else {
             $className = $this->formatGatewayClassName($name);
-            $gateway = $this->makeGateway($className, $this->config->get("gateways.{$name}", []));
+            $config = $this->config->get("gateways.{$name}", []);
+
+            if (!isset($config['timeout'])) {
+                $config['timeout'] = $this->config->get('timeout', Gateway::DEFAULT_TIMEOUT);
+            }
+
+            $gateway = $this->makeGateway($className, $config);
         }
 
         if (!($gateway instanceof GatewayInterface)) {

diff --git a/tests/EasySmsTest.php b/tests/EasySmsTest.php
@@ -186,6 +186,21 @@ public function testFormatGateways()
         $this->assertSame('g', $gateways['foo']->get('f'));
         $this->assertSame('e', $gateways['bar']->get('c'));
     }
+
+    public function testCreateGatewayWithDefaultTimeout()
+    {
+        $easySms = new EasySms([
+            'timeout' => 10.0,
+        ]);
+
+        $gateway = $easySms->gateway('aliyun');
+
+        $this->assertSame(10.0, $gateway->getTimeout());
+
+        $gateway->setTimeout(9.0);
+
+        $this->assertSame(9.0, $gateway->getTimeout());
+    }
 }
 
 class DummyGatewayNotImplementsGatewayInterface