Merge master to feature

src/db/test/Cases/Mysql/BugTest.php

@@ -317,21 +317,22 @@ public function testListType(int $uid)
         /* @var User $user*/
         $user = User::findById($uid)->getResult();
         $userAry = $user->toArray();
-
         $this->assertTrue(is_int($userAry['age']));
         $this->assertTrue(is_int($userAry['sex']));
         $this->assertTrue(is_string($userAry['desc']));
 
+        /**
+         * 通过 QueryBuilder 执行的查询将不再格式化结果属性的数据类型
+         * @see https://github.com/swoft-cloud/swoft-component/pull/209
+         */
         $row = Query::table(User::class)->where('id', $uid)->one()->getResult();
-
-        $this->assertTrue(is_int($row['age']));
-        $this->assertTrue(is_int($row['sex']));
+        $this->assertTrue(is_string($row['age']));
+        $this->assertTrue(is_string($row['sex']));
         $this->assertTrue(is_string($row['description']));
-
         $rows = Query::table(User::class)->where('id', $uid)->get()->getResult();
         foreach ($rows as $userRow){
-            $this->assertTrue(is_int($userRow['age']));
-            $this->assertTrue(is_int($userRow['sex']));
+            $this->assertTrue(is_string($userRow['age']));
+            $this->assertTrue(is_string($userRow['sex']));
             $this->assertTrue(is_string($userRow['description']));
         }
     }
@@ -374,4 +375,4 @@ public function testNoInc()
     }
 
 
-}
+}

src/http-client/src/Adapter/CoroutineAdapter.php

@@ -6,6 +6,7 @@
 use Swoft\App;
 use Swoft\Helper\JsonHelper;
 use Swoft\Http\Message\Uri\Uri;
+use Swoft\HttpClient\Exception\RuntimeException;
 use Swoft\HttpClient\HttpCoResult;
 use Swoft\HttpClient\HttpResultInterface;
 use Swoole\Coroutine;
@@ -30,7 +31,7 @@ class CoroutineAdapter implements AdapterInterface
      * @param array            $options
      * @return HttpResultInterface
      * @throws \InvalidArgumentException
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function request(RequestInterface $request, array $options = []): HttpResultInterface
     {
@@ -61,7 +62,7 @@ public function request(RequestInterface $request, array $options = []): HttpRes
 
         if (null !== $client->errCode && $client->errCode !== 0) {
             App::error(sprintf('HttpClient Request ERROR #%s url=%s', $client->errCode, $url));
-            throw new \RuntimeException(\socket_strerror($client->errCode), $client->errCode);
+            throw new RuntimeException(\socket_strerror($client->errCode), $client->errCode);
         }
 
         $result = new HttpCoResult(null, $client, $profileKey);

src/http-client/src/Adapter/CurlAdapter.php

@@ -5,6 +5,7 @@
 use Psr\Http\Message\RequestInterface;
 use Swoft\App;
 use Swoft\Helper\JsonHelper;
+use Swoft\HttpClient\Exception\RuntimeException;
 use Swoft\HttpClient\HttpResult;
 use Swoft\HttpClient\HttpResultInterface;
 
@@ -25,7 +26,7 @@ class CurlAdapter implements AdapterInterface
      * @param array            $options
      * @return HttpResultInterface
      * @throws \InvalidArgumentException
-     * @throws \RuntimeException
+     * @throws RuntimeException
      */
     public function request(RequestInterface $request, array $options = []): HttpResultInterface
     {
@@ -59,7 +60,7 @@ public function request(RequestInterface $request, array $options = []): HttpRes
         $errorString = curl_error($resource);
         if ($errorNo) {
             App::error(sprintf('HttpClient Request ERROR #%s url=%s', $errorNo, $url));
-            throw new \RuntimeException($errorString, $errorNo);
+            throw new RuntimeException($errorString, $errorNo);
         }
 
         $result = new HttpResult($result);

src/http-message/src/Server/Request.php

@@ -77,12 +77,13 @@ public static function loadFromSwooleRequest(\Swoole\Http\Request $swooleRequest
         $body = new SwooleStream($swooleRequest->rawContent());
         $protocol = isset($server['server_protocol']) ? str_replace('HTTP/', '', $server['server_protocol']) : '1.1';
         $request = new static($method, $uri, $headers, $body, $protocol);
-        return $request->withCookieParams($swooleRequest->cookie ?? [])
-                       ->withQueryParams($swooleRequest->get ?? [])
-                       ->withServerParams($server ?? [])
-                       ->withParsedBody($swooleRequest->post ?? [])
-                       ->withUploadedFiles(self::normalizeFiles($swooleRequest->files ?? []))
-                       ->setSwooleRequest($swooleRequest);
+        $request->cookieParams = ($swooleRequest->cookie ?? []);
+        $request->queryParams = ($swooleRequest->get ?? []);
+        $request->serverParams = ($server ?? []);
+        $request->parsedBody = ($swooleRequest->post ?? []);
+        $request->uploadedFiles = self::normalizeFiles($swooleRequest->files ?? []);
+        $request->swooleRequest = $swooleRequest;
+        return $request;
     }
 
     /**

src/redis/.travis.yml

@@ -11,7 +11,7 @@ services:
 install:
   - wget https://github.com/redis/hiredis/archive/v0.13.3.tar.gz -O hiredis.tar.gz && mkdir -p hiredis && tar -xf hiredis.tar.gz -C hiredis --strip-components=1 && cd hiredis && sudo make -j$(nproc) && sudo make install && sudo ldconfig && cd ..
   - echo 'no' | pecl install -f redis
-  - wget https://github.com/swoole/swoole-src/archive/v4.0.2.tar.gz -O swoole.tar.gz && mkdir -p swoole && tar -xf swoole.tar.gz -C swoole --strip-components=1 && rm swoole.tar.gz && cd swoole && phpize && ./configure --enable-async-redis && make -j$(nproc) && make install && cd -
+  - wget https://github.com/swoole/swoole-src/archive/v4.2.9.tar.gz -O swoole.tar.gz && mkdir -p swoole && tar -xf swoole.tar.gz -C swoole --strip-components=1 && rm swoole.tar.gz && cd swoole && phpize && ./configure --enable-async-redis && make -j$(nproc) && make install && cd -
   - echo "extension = swoole.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 before_script:

src/redis/src/AbstractRedisConnection.php

@@ -88,10 +88,6 @@ protected function initRedis()
             $error = sprintf('Redis connection authentication failed host=%s port=%d auth=%s', $host, (int)$port, (string)$config['auth']);
             throw new RedisException($error);
         }
-        if (isset($config['database']) && $config['database'] < 16 && false === $redis->select($config['database'])) {
-            $error = sprintf('Redis selection database failure host=%s port=%d database=%d', $host, (int)$port, (int)$config['database']);
-            throw new RedisException($error);
-        }
 
         return $redis;
     }

src/redis/src/Operator/Hashes/HashGetAll.php

@@ -21,8 +21,11 @@ public function getId()
      */
     public function parseResponse($data)
     {
-        $result = array();
+        if ($data === false) {
+            return false;
+        }
 
+        $result = [];
         for ($i = 0; $i < count($data); ++$i) {
             $result[$data[$i]] = $data[++$i];
         }

src/redis/src/Operator/Hashes/HashGetMultiple.php

@@ -21,10 +21,14 @@ public function getId()
      */
     public function parseResponse($data)
     {
+        if ($data === false) {
+            return false;
+        }
+
         $result = [];
         $hashKeys = $this->getArgument(1);
         foreach ($data as $key => $value) {
-            if (! isset($hashKeys[$key])) {
+            if (!isset($hashKeys[$key])) {
                 continue;
             }
 

src/redis/src/Operator/Processor/PrefixProcessor.php

@@ -3,6 +3,7 @@
 namespace Swoft\Redis\Operator\Processor;
 
 use Swoft\Bean\Annotation\Inject;
+use Swoft\Helper\StringHelper;
 use Swoft\Redis\Operator\CommandInterface;
 use Swoft\Bean\Annotation\Bean;
 use Swoft\Redis\Pool\Config\RedisPoolConfig;
@@ -95,6 +96,7 @@ public function init()
             'ZADD'             => 'static::first',
             'ZINCRBY'          => 'static::first',
             'ZREM'             => 'static::first',
+            'ZDELETE'          => 'static::first',
             'ZRANGE'           => 'static::first',
             'ZREVRANGE'        => 'static::first',
             'ZRANGEBYSCORE'    => 'static::first',
@@ -149,6 +151,10 @@ public function init()
             'EVALSHA'          => 'static::evalKeys',
             'ZRANGEBYLEX'      => 'static::first',
             'ZREVRANGEBYLEX'   => 'static::first',
+            'PFADD'            => 'static::first',
+            'PFCOUNT'          => 'static::allarray',
+            'PFMERGE'          => 'static::allarray',
+            'ZINTER'           => 'static::allarray2',
         ];
     }
 
@@ -257,6 +263,33 @@ public static function all(CommandInterface $command, $prefix)
         }
     }
 
+    /**
+     * Applies the specified prefix to all the arguments.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $prefix  Prefix string.
+     */
+    public static function allarray(CommandInterface $command, $prefix, $len = 0)
+    {
+        if ($arguments = $command->getArguments()) {
+            $result = [];
+            foreach ($arguments as $index => $key) {
+                if ($len > 0 && $index >= $len) {
+                    $result[] = $key;
+                } elseif (is_array($key)) {
+                    foreach ($key as &$i) {
+                        $i = "$prefix$i";
+                    }
+                    $result[] = $key;
+                } else {
+                    $result[] = "$prefix$key";
+                }
+            }
+
+            $command->setRawArguments($result);
+        }
+    }
+
     /**
      * Applies the specified prefix only to even arguments in the list.
      *
@@ -384,4 +417,15 @@ public static function zsetStore(CommandInterface $command, $prefix)
             $command->setRawArguments($arguments);
         }
     }
+
+    public static function __callStatic($name, $arguments)
+    {
+        if (StringHelper::startsWith($name, 'allarray')) {
+            $len = (int)StringHelper::replaceFirst('allarray', '', $name);
+            $arguments[] = $len;
+            return static::allarray(...$arguments);
+        }
+
+        throw new \Exception("class 'Swoft\Redis\Operator\Processor\PrefixProcessor' does not have a method '{$name}'");
+    }
 }

src/redis/src/Operator/Strings/StringPfAdd.php

@@ -0,0 +1,19 @@
+<?php
+
+
+namespace Swoft\Redis\Operator\Strings;
+
+use Swoft\Redis\Operator\Command;
+
+class StringPfAdd extends Command
+{
+    /**
+     * [String] pfAdd
+     *
+     * @return string
+     */
+    public function getId()
+    {
+        return 'pfAdd';
+    }
+}

src/redis/src/Operator/Strings/StringPfCount.php

@@ -0,0 +1,19 @@
+<?php
+
+
+namespace Swoft\Redis\Operator\Strings;
+
+use Swoft\Redis\Operator\Command;
+
+class StringPfCount extends Command
+{
+    /**
+     * [String] pfCount
+     *
+     * @return string
+     */
+    public function getId()
+    {
+        return 'pfCount';
+    }
+}

src/redis/src/Operator/Strings/StringPfMerge.php

@@ -0,0 +1,19 @@
+<?php
+
+
+namespace Swoft\Redis\Operator\Strings;
+
+use Swoft\Redis\Operator\Command;
+
+class StringPfMerge extends Command
+{
+    /**
+     * [String] pfMerge
+     *
+     * @return string
+     */
+    public function getId()
+    {
+        return 'pfMerge';
+    }
+}

src/redis/src/Operator/ZSets/ZSetInterStore.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Swoft\Redis\Operator\ZSets;
+
+use Swoft\Redis\Operator\Command;
+
+class ZSetInterStore extends Command
+{
+    public function getId()
+    {
+        return 'ZInter';
+    }
+}

src/redis/src/Pool/RedisPool.php

@@ -39,9 +39,6 @@ public function createConnection(): ConnectionInterface
             $redis = new SyncRedisConnection($this);
         }
 
-        $dbIndex = $this->poolConfig->getDb();
-        $redis->select($dbIndex);
-
         return $redis;
     }
 }

src/redis/src/Profile/RedisCommandProvider.php

@@ -80,6 +80,10 @@ public function getSupportedCommands(): array
             'INCRBYFLOAT'         => '\Swoft\Redis\Operator\Strings\StringIncrementByFloat',
             'BITOP'               => '\Swoft\Redis\Operator\Strings\StringBitOp',
             'BITCOUNT'            => '\Swoft\Redis\Operator\Strings\StringBitCount',
+            /* ---------------- Redis 2.8 ---------------- */
+            'PFADD'               => '\Swoft\Redis\Operator\Strings\StringPfAdd',
+            'PFCOUNT'             => '\Swoft\Redis\Operator\Strings\StringPfCount',
+            'PFMERGE'             => '\Swoft\Redis\Operator\Strings\StringPfMerge',
 
             /* commands operating on lists */
             /* ---------------- Redis 1.2 ---------------- */
@@ -146,6 +150,7 @@ public function getSupportedCommands(): array
             'ZREVRANK'            => '\Swoft\Redis\Operator\ZSets\ZSetReverseRank',
             'ZREMRANGEBYRANK'     => '\Swoft\Redis\Operator\ZSets\ZSetRemoveRangeByRank',
             'ZDELETERANGEBYRANK'  => '\Swoft\Redis\Operator\ZSets\ZSetRemoveRangeByRank',
+            'ZINTER'              => '\Swoft\Redis\Operator\ZSets\ZSetInterStore',
             /* ---------------- Redis 2.2 ---------------- */
             'ZREVRANGEBYSCORE'    => '\Swoft\Redis\Operator\ZSets\ZSetReverseRangeByScore',
             /* ---------------- Redis 2.8 ---------------- */

src/redis/src/RedisConnection.php

@@ -33,6 +33,10 @@ public function createConnection()
     {
         $redis            = $this->initRedis();
         $this->connection = $redis;
+
+        /** @var RedisPoolConfig $config */
+        $config = $this->getPool()->getPoolConfig();
+        $redis->select($config->getDb());
     }
 
     /**

src/redis/src/SyncRedisConnection.php

@@ -39,6 +39,10 @@ public function createConnection()
             $redis->setOption(\Redis::OPT_PREFIX, $prefix);
         }
         $this->connection = $redis;
+
+        /** @var RedisPoolConfig $config */
+        $config = $this->getPool()->getPoolConfig();
+        $redis->select($config->getDb());
     }
 
     /**