修改连接池配置的timeout字段为float (swoft-cloud/swoft-component#177)

* 更改连接池timeout字段为float * 增加单测
swoft-cloud · Aug 12, 2018 · 062048b · 062048b
1 parent ec209fd
commit 062048b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/framework/src/Pool/PoolConfigInterface.php b/framework/src/Pool/PoolConfigInterface.php
@@ -27,9 +27,9 @@ public function getMaxActive(): int;
     public function getMaxWait(): int;
 
     /**
-     * @return int
+     * @return float
      */
-    public function getTimeout(): int;
+    public function getTimeout(): float;
 
     /**
      * @return array

diff --git a/framework/src/Pool/PoolProperties.php b/framework/src/Pool/PoolProperties.php
@@ -53,7 +53,7 @@ class PoolProperties implements PoolConfigInterface
     /**
      * Connection timeout
      *
-     * @var int
+     * @var float
      */
     protected $timeout = 3;
 
@@ -126,9 +126,9 @@ public function getMaxWait(): int
     }
 
     /**
-     * @return int
+     * @return float
      */
-    public function getTimeout(): int
+    public function getTimeout(): float
     {
         return $this->timeout;
     }

diff --git a/framework/test/Cases/Pool/DemoPoolConfig.php b/framework/test/Cases/Pool/DemoPoolConfig.php
@@ -12,5 +12,5 @@
  */
 class DemoPoolConfig extends PoolProperties
 {
-
+    protected $timeout = 0.5;
 }
diff --git a/framework/test/Cases/PoolTest.php b/framework/test/Cases/PoolTest.php
@@ -13,6 +13,7 @@
 use SwoftTest\Pool\ConsulEnvConfig;
 use SwoftTest\Pool\ConsulPptConfig;
 use SwoftTest\Pool\DemoPool;
+use SwoftTest\Pool\DemoPoolConfig;
 use SwoftTest\Pool\EnvAndPptFromPptPoolConfig;
 use SwoftTest\Pool\EnvAndPptPoolConfig;
 use SwoftTest\Pool\EnvPoolConfig;
@@ -170,4 +171,13 @@ public function testGetConnectionByCo()
             $this->testGetConnection();
         });
     }
+
+    public function testPoolConfigTimeout()
+    {
+        $pConfig = App::getBean(EnvPoolConfig::class);
+        $this->assertEquals($pConfig->getTimeout(), 2);
+
+        $dConfig = App::getBean(DemoPoolConfig::class);
+        $this->assertEquals($dConfig->getTimeout(), 0.5);
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,5 +12,5 @@ @@
      */
     class DemoPoolConfig extends PoolProperties
     {
+        protected $timeout = 0.5;
     }