Merge branch 'master' into 1.0-merge

Author: limingxinleo

composer.json

@@ -12,13 +12,13 @@
     },
     "require": {
         "php": ">=7.2",
-        "psr/container": "^1.0",
-        "hyperf/contract": "~1.0.0",
-        "hyperf/pool": "~1.0.0",
-        "hyperf/utils": "~1.0.0"
+        "hyperf/contract": "~1.1.0",
+        "hyperf/pool": "~1.1.0",
+        "hyperf/utils": "~1.1.0",
+        "psr/container": "^1.0"
     },
     "require-dev": {
-        "hyperf/di": "~1.0.0",
+        "hyperf/di": "~1.1.0",
         "malukenho/docheader": "^0.1.6",
         "mockery/mockery": "^1.0",
         "phpunit/phpunit": "^7.0.0",
@@ -42,7 +42,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0-dev"
+            "dev-master": "1.1-dev"
         },
         "hyperf": {
             "config": "Hyperf\\Redis\\ConfigProvider"

src/Frequency.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://doc.hyperf.io
+ * @contact  [email protected]
+ * @license  https://github.com/hyperf-cloud/hyperf/blob/master/LICENSE
+ */
+
+namespace Hyperf\Redis;
+
+use Hyperf\Pool\Frequency as DefaultFrequency;
+
+class Frequency extends DefaultFrequency
+{
+}

src/Pool/RedisPool.php

@@ -15,6 +15,7 @@
 use Hyperf\Contract\ConfigInterface;
 use Hyperf\Contract\ConnectionInterface;
 use Hyperf\Pool\Pool;
+use Hyperf\Redis\Frequency;
 use Hyperf\Redis\RedisConnection;
 use Hyperf\Utils\Arr;
 use Psr\Container\ContainerInterface;
@@ -43,6 +44,8 @@ public function __construct(ContainerInterface $container, string $name)
         $this->config = $config->get($key);
         $options = Arr::get($this->config, 'pool', []);
 
+        $this->frequency = make(Frequency::class);
+
         parent::__construct($container, $options);
     }
 

src/RedisConnection.php

@@ -106,6 +106,8 @@ public function reconnect(): bool
 
     public function close(): bool
     {
+        unset($this->connection);
+
         return true;
     }
 

tests/RedisConnectionTest.php

@@ -15,6 +15,11 @@
 use Hyperf\Config\Config;
 use Hyperf\Contract\ConfigInterface;
 use Hyperf\Di\Container;
+use Hyperf\Pool\Channel;
+use Hyperf\Pool\LowFrequencyInterface;
+use Hyperf\Pool\PoolOption;
+use Hyperf\Redis\Frequency;
+use Hyperf\Utils\ApplicationContext;
 use HyperfTest\Redis\Stub\RedisPoolStub;
 use Mockery;
 use PHPUnit\Framework\TestCase;
@@ -70,10 +75,33 @@ public function testRedisConnectionReconnect()
         $this->assertSame(null, $connection->getDatabase());
     }
 
+    public function testRedisCloseInLowFrequency()
+    {
+        $pool = $this->getRedisPool();
+
+        $connection1 = $pool->get()->getConnection();
+        $connection2 = $pool->get()->getConnection();
+        $connection3 = $pool->get()->getConnection();
+
+        $this->assertSame(3, $pool->getCurrentConnections());
+
+        $connection1->release();
+        $connection2->release();
+        $connection3->release();
+
+        $this->assertSame(3, $pool->getCurrentConnections());
+
+        $connection = $pool->get()->getConnection();
+
+        $this->assertSame(1, $pool->getCurrentConnections());
+
+        $connection->release();
+    }
+
     private function getRedisPool()
     {
         $container = Mockery::mock(Container::class);
-        $container->shouldReceive('get')->once()->with(ConfigInterface::class)->andReturn(new Config([
+        $container->shouldReceive('get')->with(ConfigInterface::class)->andReturn(new Config([
             'redis' => [
                 'default' => [
                     'host' => 'redis',
@@ -91,6 +119,18 @@ private function getRedisPool()
             ],
         ]));
 
+        $frequency = Mockery::mock(LowFrequencyInterface::class);
+        $frequency->shouldReceive('isLowFrequency')->andReturn(true);
+        $container->shouldReceive('make')->with(Frequency::class, Mockery::any())->andReturn($frequency);
+        $container->shouldReceive('make')->with(PoolOption::class, Mockery::any())->andReturnUsing(function ($class, $args) {
+            return new PoolOption(...array_values($args));
+        });
+        $container->shouldReceive('make')->with(Channel::class, Mockery::any())->andReturnUsing(function ($class, $args) {
+            return new Channel($args['size']);
+        });
+
+        ApplicationContext::setContainer($container);
+
         return new RedisPoolStub($container, 'default');
     }
 }