Upgrade tarantool/client to v0.5.0

Author: rybakit

.php_cs.dist

@@ -84,14 +84,18 @@ return Config::create()
         'FilterableFixer/native_function_invocation' => true,
         'no_useless_else' => true,
         'no_useless_return' => true,
-        'ordered_imports' => true,
+        'ordered_imports' => [
+            'sort_algorithm' => 'alpha',
+            'imports_order' => ['class', 'function', 'const'],
+        ],
         'phpdoc_order' => true,
         'phpdoc_align' => false,
         'return_type_declaration' => ['space_before' => 'one'],
         'strict_comparison' => true,
         'header_comment' => [
+            'comment_type' => 'PHPDoc',
             'header' => $header,
-            'location' => 'after_declare_strict',
+            'location' => 'after_open',
             'separate' => 'both',
         ],
     ])

.travis.yml

@@ -6,17 +6,17 @@ services:
   - docker
 
 env:
-  - IMAGE='php:7.1-cli' TNT_CLIENT=pecl
-  - IMAGE='php:7.1-cli' CHECK_CS=1
-  - IMAGE='php:7.2-cli' PHPUNIT_OPTS='--coverage-clover=coverage.clover'
-  - IMAGE='php:7.3-cli'
+  - PHP_IMAGE='php:7.1-cli' TNT_CLIENT=pecl
+  - PHP_IMAGE='php:7.1-cli' CHECK_CS=1
+  - PHP_IMAGE='php:7.2-cli' PHPUNIT_OPTS='--coverage-clover=coverage.clover'
+  - PHP_IMAGE='php:7.3-cli'
 
 install:
   - ./dockerfile.sh | tee /dev/tty | docker build -t queue -
 
 script:
   - docker network create tarantool-php
-  - docker run -d --net=tarantool-php --name=tarantool -v `pwd`:/queue tarantool/tarantool:1 tarantool /queue/tests/Integration/queues.lua
+  - docker run -d --net=tarantool-php --name=tarantool -v `pwd`:/queue tarantool/tarantool:2 tarantool /queue/tests/Integration/queues.lua
   - docker run --rm --net=tarantool-php -v `pwd`:/queue -w /queue -e PHPUNIT_OPTS="$PHPUNIT_OPTS" queue
 
 after_script:

README.md

@@ -294,21 +294,22 @@ Then run Tarantool instance (needed for integration tests):
 
 ```bash
 docker network create tarantool-php
-docker run -d --net=tarantool-php --name=tarantool -v `pwd`:/queue \
-    tarantool/tarantool:1 tarantool /queue/tests/Integration/queues.lua
+docker run -d --net=tarantool-php -p 3301:3301 --name=tarantool \
+    -v $(pwd)/tests/Integration/queues.lua:/queues.lua \
+    tarantool/tarantool:2 tarantool /queues.lua
 ```
 
 And then run both unit and integration tests:
 
 ```bash
-docker run --rm --net=tarantool-php --name=queue -v `pwd`:/queue -w /queue queue
+docker run --rm --net=tarantool-php -v `pwd`:/queue -w /queue queue
 ```
 
 To run only integration or unit tests, set the `PHPUNIT_OPTS` environment variable
 to either `--testsuite integration` or `--testsuite unit` respectively, e.g.:
 
 ```bash
-docker run --rm --net=tarantool-php --name=queue -v `pwd`:/queue -w /queue \
+docker run --rm --net=tarantool-php -v `pwd`:/queue -w /queue \
     -e PHPUNIT_OPTS='--testsuite unit' queue
 ```
 

composer.json

@@ -14,10 +14,10 @@
         "php": "^7.1"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.13",
+        "friendsofphp/php-cs-fixer": "^2.14",
         "phpunit/phpunit": "^7.4",
-        "rybakit/msgpack": "@dev",
-        "tarantool/client": "@dev"
+        "rybakit/msgpack": "^0.5.4",
+        "tarantool/client": "^0.5.0"
     },
     "suggest": {
         "ext-tarantool": "For using pecl extension",

dockerfile.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-if [[ -z "$IMAGE" ]] ; then
-    IMAGE='php:7.2-cli'
+if [[ -z "$PHP_IMAGE" ]] ; then
+    PHP_IMAGE='php:7.3-cli'
 fi
 
 if [[ -z "$TNT_CLIENT" ]] ; then
@@ -24,10 +24,10 @@ if [[ "1" != "$CHECK_CS" ]]; then
 fi
 
 echo -e "
-FROM $IMAGE
+FROM $PHP_IMAGE
 
 RUN apt-get update && \\
-    apt-get install -y git curl libzip-dev && \\
+    apt-get install -y curl git libzip-dev && \\
     docker-php-ext-configure zip --with-libzip && \\
     docker-php-ext-install zip${RUN_CMDS}
 

src/ClientAdapter.php

@@ -28,11 +28,11 @@ final class Queue
      */
     public function __construct($client, string $name)
     {
-        if ($client instanceof Client) {
-            $client = new ClientAdapter($client);
-        } elseif (!$client instanceof \Tarantool) {
+        if ($client instanceof \Tarantool) {
+            $client = new TarantoolAdapter($client);
+        } elseif (!$client instanceof Client) {
             throw new \InvalidArgumentException(\sprintf(
-                '%s() expects parameter 1 to be Tarantool or %s, %s given.',
+                '%s() expects parameter 1 to be %s or Tarantool, %s given.',
                 __METHOD__, Client::class, \is_object($client) ? \get_class($client) : \gettype($client)
             ));
         }
@@ -48,68 +48,63 @@ public function getName() : string
 
     public function put($data, array $options = []) : Task
     {
-        $args = $options ? [$data, $options] : [$data];
-        $result = $this->client->call("queue.tube.$this->name:put", $args);
-
-        return Task::createFromTuple($result[0]);
+        return Task::createFromTuple(
+            $this->client->call("queue.tube.$this->name:put", $data, $options)[0]
+        );
     }
 
     public function take(float $timeout = null) : ?Task
     {
-        $args = null === $timeout ? [] : [$timeout];
-        $result = $this->client->call("queue.tube.$this->name:take", $args);
+        $result = $this->client->call("queue.tube.$this->name:take", $timeout);
 
         return empty($result[0]) ? null : Task::createFromTuple($result[0]);
     }
 
     public function touch(int $taskId, float $increment) : ?Task
     {
-        $result = $this->client->call("queue.tube.$this->name:touch", [$taskId, $increment]);
+        $result = $this->client->call("queue.tube.$this->name:touch", $taskId, $increment);
 
         return empty($result[0]) ? null : Task::createFromTuple($result[0]);
     }
 
     public function ack(int $taskId) : Task
     {
-        $result = $this->client->call("queue.tube.$this->name:ack", [$taskId]);
-
-        return Task::createFromTuple($result[0]);
+        return Task::createFromTuple(
+            $this->client->call("queue.tube.$this->name:ack", $taskId)[0]
+        );
     }
 
     public function release(int $taskId, array $options = []) : Task
     {
-        $args = $options ? [$taskId, $options] : [$taskId];
-        $result = $this->client->call("queue.tube.$this->name:release", $args);
-
-        return Task::createFromTuple($result[0]);
+        return Task::createFromTuple(
+            $this->client->call("queue.tube.$this->name:release", $taskId, $options)[0]
+        );
     }
 
     public function peek(int $taskId) : Task
     {
-        $result = $this->client->call("queue.tube.$this->name:peek", [$taskId]);
-
-        return Task::createFromTuple($result[0]);
+        return Task::createFromTuple(
+            $this->client->call("queue.tube.$this->name:peek", $taskId)[0]
+        );
     }
 
     public function bury(int $taskId) : Task
     {
-        $result = $this->client->call("queue.tube.$this->name:bury", [$taskId]);
-
-        return Task::createFromTuple($result[0]);
+        return Task::createFromTuple(
+            $this->client->call("queue.tube.$this->name:bury", $taskId)[0]
+        );
     }
 
     public function kick(int $count) : int
     {
-        $result = $this->client->call("queue.tube.$this->name:kick", [$count]);
-
-        return $result[0][0];
+        return $this->client->call("queue.tube.$this->name:kick", $count)[0];
     }
 
     public function delete(int $taskId) : Task
     {
-        $result = $this->client->call("queue.tube.$this->name:delete", [$taskId]);
-
-        return Task::createFromTuple($result[0]);
+        return Task::createFromTuple(
+            $this->client->call("queue.tube.$this->name:delete", $taskId)[0]
+        );
     }
 
     public function truncate() : void
@@ -126,25 +121,24 @@ public function truncate() : void
      */
     public function stats(string $path = null)
     {
-        $result = $this->client->call('queue.stats', [$this->name]);
+        [$stats] = $this->client->call('queue.stats', $this->name);
 
         if (null === $path) {
-            return $result[0][0];
+            return $stats;
         }
 
-        $result = $result[0][0];
         foreach (\explode('.', $path) as $key) {
-            if (!isset($result[$key])) {
+            if (!isset($stats[$key])) {
                 throw new \InvalidArgumentException(\sprintf('Invalid path "%s".', $path));
             }
-            $result = $result[$key];
+            $stats = $stats[$key];
         }
 
-        return $result;
+        return $stats;
     }
 
     public function call(string $methodName, ...$args) : array
     {
-        return $this->client->call("queue.tube.$this->name:$methodName", $args);
+        return $this->client->call("queue.tube.$this->name:$methodName", ...$args);
     }
 }

src/Queue.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the Tarantool Queue package.
+ *
+ * (c) Eugene Leonovich <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Tarantool\Queue;
+
+final class TarantoolAdapter
+{
+    private $tarantool;
+
+    public function __construct(\Tarantool $tarantool)
+    {
+        $this->tarantool = $tarantool;
+    }
+
+    public function call(string $funcName, ...$args) : array
+    {
+        return $this->tarantool->call($funcName, $args);
+    }
+}

src/TarantoolAdapter.php

@@ -15,8 +15,6 @@
 
 use PHPUnit\Framework\TestCase;
 use Tarantool\Client\Client;
-use Tarantool\Client\Connection\StreamConnection;
-use Tarantool\Client\Packer\PurePacker;
 use Tarantool\Queue\Queue;
 use Tarantool\Queue\States;
 use Tarantool\Queue\Task;
@@ -35,19 +33,12 @@ abstract class QueueTest extends TestCase
 
     public static function setUpBeforeClass() : void
     {
-        if (class_exists(\Tarantool::class, false)) {
-            self::$client = new \Tarantool(
-                getenv('TARANTOOL_HOST'),
-                (int) getenv('TARANTOOL_PORT')
-            );
+        $host = getenv('TARANTOOL_HOST');
+        $port = (int) getenv('TARANTOOL_PORT');
 
-            return;
-        }
-
-        $uri = sprintf('tcp://%s:%d', getenv('TARANTOOL_HOST'), getenv('TARANTOOL_PORT'));
-        $conn = new StreamConnection($uri);
-
-        self::$client = new Client($conn, new PurePacker());
+        self::$client = extension_loaded('tarantool')
+            ? new \Tarantool($host, $port)
+            : Client::fromDsn(sprintf('tcp://%s:%d', $host, $port));
     }
 
     public static function tearDownAfterClass() : void
@@ -63,12 +54,12 @@ protected function setUp() : void
         $tubeType = $this->getTubeType();
         $queueName = sprintf('t_%s_%s', $tubeType, $testName);
 
-        self::$client->evaluate('create_tube(...)', [$queueName, $tubeType]);
+        $this->evaluate('create_tube(...)', $queueName, $tubeType);
 
         $ann = $this->getAnnotations();
         if (!empty($ann['method']['eval'])) {
             foreach ($ann['method']['eval'] as $eval) {
-                self::$client->evaluate(str_replace('%tube_name%', $queueName, $eval));
+                $this->evaluate(str_replace('%tube_name%', $queueName, $eval));
             }
         }
 
@@ -396,7 +387,7 @@ public function testCall() : void
     {
         $result = $this->queue->call('pow', 2, 8);
 
-        self::assertSame(256, $result[0][0]);
+        self::assertSame(256, $result[0]);
     }
 
     /**
@@ -453,4 +444,11 @@ protected function getTubeType() : string
 
         return strtolower($type);
     }
+
+    final protected function evaluate(string $expr, ...$args) : array
+    {
+        return self::$client instanceof Client
+            ? self::$client->evaluate($expr, ...$args)
+            : self::$client->evaluate($expr, $args);
+    }
 }

tests/Integration/QueueTest.php

@@ -8,14 +8,7 @@ box.cfg {
     slab_alloc_arena = .1,
 }
 
--- local function bootstrap()
---     box.schema.user.grant('guest', 'read,write,execute', 'universe')
--- end
-
--- box.once('queues', bootstrap)
-
-console = require('console')
-console.listen('127.0.0.1:33333')
+box.schema.user.grant('guest', 'read,write,execute,create,drop,alter', 'universe', nil, {if_not_exists = true})
 
 queue = require('queue')