Drop TarantoolAdapter and refactor tests

Author: rybakit

.php_cs.dist

@@ -57,7 +57,7 @@ final class FilterableFixer implements FixerInterface
 };
 
 $header = <<<EOF
-This file is part of the Tarantool Queue package.
+This file is part of the tarantool/queue package.
 
 (c) Eugene Leonovich <[email protected]>
 

.travis.yml

@@ -7,31 +7,34 @@ services:
 
 env:
   global:
-    TNT_IMAGE='tarantool/tarantool:2'
+    TNT_IMAGE='tarantool/tarantool:2.4'
 
   matrix:
     - PHP_IMAGE='php:7.1-cli'
     - PHP_IMAGE='php:7.2-cli'
-    - PHP_IMAGE='php:7.2-cli' TNT_CLIENT=pecl PHPUNIT_OPTS='--coverage-text --coverage-clover=coverage.clover'
-    - PHP_IMAGE='php:7.3-cli' CHECK_CS=1
-    - PHP_IMAGE='php:7.4-cli' PHPUNIT_OPTS='--coverage-text --coverage-clover=coverage.clover'
+    - PHP_IMAGE='php:7.3-cli' QA=1
+    - PHP_IMAGE='php:7.4-cli' COVERAGE_FILE='coverage.clover'
 
     - PHP_IMAGE='php:7.4-cli' TNT_IMAGE='tarantool/tarantool:1.7'
     - PHP_IMAGE='php:7.4-cli' TNT_IMAGE='tarantool/tarantool:1.9'
     - PHP_IMAGE='php:7.4-cli' TNT_IMAGE='tarantool/tarantool:1'
     - PHP_IMAGE='php:7.4-cli' TNT_IMAGE='tarantool/tarantool:2.1'
+    - PHP_IMAGE='php:7.4-cli' TNT_IMAGE='tarantool/tarantool:2.3'
 
 install:
   - ./dockerfile.sh | tee /dev/tty | docker build -t queue -
 
 script:
   - docker network create tarantool-php
   - docker run --net=tarantool-php --rm ${TNT_IMAGE} /usr/local/bin/tarantool --version
-  - docker run -d --net=tarantool-php --name=tarantool -v `pwd`:/queue ${TNT_IMAGE} tarantool /queue/tests/Integration/queues.lua
-  - docker run --rm --net=tarantool-php -v `pwd`:/queue -w /queue -e PHPUNIT_OPTS="$PHPUNIT_OPTS" queue
+  - docker run -d --net=tarantool-php --name=tarantool -v `pwd`:/queue -e TNT_LISTEN_URI=$TNT_LISTEN_URI ${TNT_IMAGE} tarantool /queue/tests/Integration/queues.lua
+  - docker run --rm --net=tarantool-php -v `pwd`:/queue -w /queue queue
+  - if [[ -n "$QA" ]]; then
+      docker run --net=tarantool-php --rm -v $(pwd):/queue -w /queue queue php vendor/bin/php-cs-fixer fix --dry-run --diff --verbose .;
+    fi
 
 after_script:
-  - if [[ -f coverage.clover ]]; then
+  - if [[ -f "$COVERAGE_FILE" ]]; then
       curl -sSOL https://scrutinizer-ci.com/ocular.phar &&
-      docker run --rm -v $(pwd):/queue -w /queue queue php ocular.phar code-coverage:upload --format=php-clover coverage.clover;
+      docker run --rm -v $(pwd):/queue -w /queue queue php ocular.phar code-coverage:upload --format=php-clover "$COVERAGE_FILE";
     fi

README.md

@@ -22,7 +22,7 @@ Lua modules, called [LuaRocks](https://luarocks.org/). This package provides PHP
    * [Consumer API](#consumer-api)
    * [Statistics](#statistics)
    * [Custom methods](#custom-methods)
- * [Tests](#tests)
+ * [Testing](#testing)
  * [License](#license)
 
 
@@ -34,10 +34,6 @@ The recommended way to install the library is through [Composer](http://getcompo
 composer require tarantool/queue
 ```
 
-In addition, you will need to install one of the supported Tarantool connectors 
-(either [tarantool-php/client](https://github.com/tarantool-php/client) 
-or [tarantool/tarantool-php](https://github.com/tarantool/tarantool-php)).
-
 
 ## Before start
 
@@ -47,14 +43,14 @@ is configured, up and running. The minimal required configuration might look lik
 ```lua
 -- queues.lua
 
-box.cfg {listen=3301}
+box.cfg {listen = 3301}
 
 queue = require('queue')
-queue.create_tube('foobar', 'fifottl', {if_not_exists=true})
+queue.create_tube('foobar', 'fifottl', {if_not_exists = true})
 ```
 
-> *You can read more about the box configuration in the official [Tarantool documentation](http://tarantool.org/doc/book/configuration/index.html#initialization-file).
-> For more information about the queue configuration check out [queue's README](https://github.com/tarantool/queue/blob/master/README.md).*
+> *You can read more about the box configuration in the official Tarantool [documentation](http://tarantool.org/doc/book/configuration/index.html#initialization-file).
+> More information on queue configuration can be found [here](https://github.com/tarantool/queue/blob/master/README.md).*
 
 To start the instance you need to copy (or symlink) `queues.lua` file into the `/etc/tarantool/instances.enabled`
 directory and run the following command:
@@ -77,8 +73,7 @@ use Tarantool\Queue\Queue;
 $queue = new Queue($client, 'foobar');
 ```
 
-where `$client` is either an instance of the `Tarantool` class from the [pecl extension](https://github.com/tarantool/tarantool-php) 
-or an instance of `Tarantool\Client\Client` from the [pure PHP package](https://github.com/tarantool-php/client).
+where `$client` is an instance of `Tarantool\Client\Client` from the [tarantool/client](https://github.com/tarantool-php/client) package.
 
 
 ### Data types
@@ -96,13 +91,13 @@ $queue->put(['foo' => ['bar' => ['baz' => null]]]);
 $queue->put(new MyObject());
 ```
 
-> *Object serialization is only supported when [tarantool/client](https://github.com/tarantool-php/client) is used.*
+> *To learn more about object serialization, please follow this [link](https://github.com/tarantool-php/client#user-defined-types).*
 
 
 ### Tasks
 
-Most of the [Queue API](src/Queue.php) methods return back
-a [Task](src/Task.php) object containing the following getters:
+Most of the [Queue API](src/Queue.php) methods return a [Task](src/Task.php) object
+containing the following getters:
 
 ```php
 Task::getId()
@@ -212,7 +207,7 @@ $queue->truncate();
 
 > *For a detailed API documentation, please read the section 
 > "[Using the queue module](https://github.com/tarantool/queue#using-the-queue-module)" 
-> of the [queue's README](https://github.com/tarantool/queue/blob/master/README.md).*
+> of the queue README.*
 
 
 ### Statistics
@@ -255,9 +250,9 @@ $total = $queue->stats('tasks.total');
 
 ### Custom methods
 
-Thanks to flexible nature of the [tarantool/queue](https://github.com/tarantool/queue/) module, 
-you can easily create your own queue drivers or extend existing ones with an additional functionality. 
-For example, you added the `put_many` method to your `foobar` queue, which inserts multiple tasks in a transaction:  
+Thanks to flexible nature of the [queue](https://github.com/tarantool/queue/) Lua module, you can easily create
+your own queue drivers or extend existing ones with an additional functionality. For example, suppose you added
+the `put_many` method to your `foobar` queue, which inserts multiple tasks atomically:
 
 ```lua
 -- queues.lua
@@ -277,7 +272,7 @@ queue.tube.foobar.put_many = function(self, items)
 end
 ```
 
-To call this method on a `$queue` object, use `Queue::call()`:
+To invoke this method from php, use `Queue::call()`:
 
 ```php
 $result = $queue->call('put_many', [
@@ -287,15 +282,15 @@ $result = $queue->call('put_many', [
 ```
 
 
-## Tests
+## Testing
 
 The easiest way to run tests is with Docker. First, build an image using the [dockerfile.sh](dockerfile.sh) generator:
 
 ```bash
 ./dockerfile.sh | docker build -t queue -
 ```
 
-Then run Tarantool instance (needed for integration tests):
+Then run a Tarantool instance (needed for integration tests):
 
 ```bash
 docker network create tarantool-php

composer.json

@@ -11,17 +11,13 @@
         }
     ],
     "require": {
-        "php": "^7.1"
+        "php": "^7.1",
+        "tarantool/client": "^0.7"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.14",
-        "phpunit/phpunit": "^7.4",
-        "rybakit/msgpack": "^0.6.0",
-        "tarantool/client": "^0.6.0"
-    },
-    "suggest": {
-        "ext-tarantool": "For using pecl extension",
-        "tarantool/client": "For using pure client"
+        "rybakit/msgpack": "^0.7",
+        "tarantool/phpunit-extras": "dev-master"
     },
     "autoload": {
         "psr-4": {

dockerfile.sh

@@ -1,26 +1,15 @@
 #!/usr/bin/env bash
 
 if [[ -z "$PHP_IMAGE" ]] ; then
-    PHP_IMAGE='php:7.2-cli'
+    PHP_IMAGE='php:7.4-cli'
 fi
 
-if [[ -z "$TNT_CLIENT" ]] ; then
-    TNT_CLIENT='pure'
+if [[ -z "$TNT_LISTEN_URI" ]]; then
+    TNT_LISTEN_URI='tarantool:3301'
 fi
 
-if [[ $TNT_CLIENT == pecl ]]; then
-    RUN_CMDS="$RUN_CMDS && \\\\\n    git clone https://github.com/tarantool/tarantool-php.git /usr/src/php/ext/tarantool"
-    RUN_CMDS="$RUN_CMDS && \\\\\n    git --git-dir=/usr/src/php/ext/tarantool/.git --work-tree=/usr/src/php/ext/tarantool checkout php7-v2"
-    RUN_CMDS="$RUN_CMDS && \\\\\n    echo tarantool >> /usr/src/php-available-exts && docker-php-ext-install tarantool"
-    COMPOSER_REMOVE='tarantool/client'
-fi
-
-if [[ $PHPUNIT_OPTS =~ (^|[[:space:]])--coverage-[[:alpha:]] ]]; then
-    RUN_CMDS="$RUN_CMDS && \\\\\n    pecl install xdebug && docker-php-ext-enable xdebug"
-fi
-
-if [[ "1" != "$CHECK_CS" ]]; then
-    COMPOSER_REMOVE="$COMPOSER_REMOVE friendsofphp/php-cs-fixer"
+if [[ -n "$COVERAGE_FILE" ]]; then
+    RUN_CMDS="$RUN_CMDS && \\\\\n    pecl install pcov && docker-php-ext-enable pcov"
 fi
 
 echo -e "
@@ -31,8 +20,8 @@ RUN apt-get update && apt-get install -y curl git unzip${RUN_CMDS}
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 ENV PATH=~/.composer/vendor/bin:\$PATH
-ENV TARANTOOL_HOST=tarantool TARANTOOL_PORT=3301
+ENV TNT_LISTEN_URI=$TNT_LISTEN_URI
 
-CMD if [ ! -f composer.lock ]; then ${COMPOSER_REMOVE:+composer remove --dev --no-update }$COMPOSER_REMOVE${COMPOSER_REMOVE:+ && }composer install; fi && \\
-    vendor/bin/phpunit\${PHPUNIT_OPTS:+ }\$PHPUNIT_OPTS
+CMD if [ ! -f composer.lock ]; then composer install; fi && \\
+    vendor/bin/phpunit ${COVERAGE_FILE:+ --coverage-text --coverage-clover=}$COVERAGE_FILE
 "

phpunit.xml.dist

@@ -11,8 +11,7 @@
         <ini name="display_startup_errors" value="On" />
         <ini name="error_reporting" value="E_ALL" />
 
-        <env name="TARANTOOL_HOST" value="127.0.0.1" />
-        <env name="TARANTOOL_PORT" value="3301" />
+        <env name="TNT_LISTEN_URI" value="3301" />
     </php>
 
     <testsuites>
@@ -30,4 +29,13 @@
             <directory>src</directory>
         </whitelist>
     </filter>
+
+<!--    <extensions>-->
+<!--&lt;!&ndash;        <extension class="Tarantool\PhpUnit\Annotation\AnnotationExtension">&ndash;&gt;-->
+<!--        <extension class="Tarantool\Queue\Tests\AnnotationExtension">-->
+<!--            <arguments>-->
+<!--                <string>tcp://%env(TARANTOOL_HOST)%:%env(TARANTOOL_PORT)%</string>-->
+<!--            </arguments>-->
+<!--        </extension>-->
+<!--    </extensions>-->
 </phpunit>

src/Options.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * This file is part of the Tarantool Queue package.
+ * This file is part of the tarantool/queue package.
  *
  * (c) Eugene Leonovich <[email protected]>
  *
@@ -20,4 +20,8 @@ final class Options
     public const TTL = 'ttl';
     public const TTR = 'ttr';
     public const UTUBE = 'utube';
+
+    private function __construct()
+    {
+    }
 }