Fix coverage generation

Author: Eugene Leonovich

.gitignore

@@ -1,4 +1,4 @@
 /vendor/
 /composer.lock
-/coverage.clover
+/coverage.*
 /phpunit.xml

.travis.yml

@@ -8,7 +8,7 @@ services:
 env:
   - PHP_RUNTIME='php:5.4-cli'
   - PHP_RUNTIME='php:5.5-cli'
-  - PHP_RUNTIME='php:5.6-cli' PHPUNIT_OPTS='--coverage-clover coverage.clover'
+  - PHP_RUNTIME='php:5.6-cli' PHPUNIT_OPTS='--coverage-clover=coverage.clover'
 
 before_install:
   # https://github.com/travis-ci/travis-ci/issues/4778
@@ -20,7 +20,7 @@ install:
 
 script:
   - docker run -d --name tarantool -v $(pwd):/queue tarantool/tarantool /queue/tests/Integration/instance.lua
-  - docker run --rm --name queue --link tarantool -v $(pwd):/queue -w /queue queue
+  - docker run --rm --name queue --link tarantool -v $(pwd):/queue -w /queue -e PHPUNIT_OPTS="$PHPUNIT_OPTS" queue
 
 after_script:
   - docker run --rm --name queue -v $(pwd):/queue -w /queue queue bash -c "

README.md

@@ -240,7 +240,8 @@ To run only integration or unit tests, set the `PHPUNIT_OPTS` environment variab
 to either `--testsuite Integration` or `--testsuite Unit` respectively, e.g.:
 
 ```sh
-$ PHPUNIT_OPTS='--testsuite Unit' docker run --rm --name queue -v $(pwd):/queue -w /queue queue
+$ docker run --rm --name queue -v $(pwd):/queue -w /queue \
+    -e PHPUNIT_OPTS='--testsuite Unit' queue
 ```
 
 

dockerfile.sh

@@ -11,7 +11,7 @@ if [[ $PHP_RUNTIME == php* ]]; then
     RUN_CMDS="$RUN_CMDS && \\\\\n    docker-php-ext-install zip tarantool"
 fi
 
-if [[ $PHPUNIT_OPTS =~ (^|[[:space:]])--clover-[[:alpha:]] ]]; then
+if [[ $PHPUNIT_OPTS =~ (^|[[:space:]])--coverage-[[:alpha:]] ]]; then
     RUN_CMDS="$RUN_CMDS && \\\\\n    git clone https://github.com/xdebug/xdebug.git /usr/src/php/ext/xdebug"
     RUN_CMDS="$RUN_CMDS && \\\\\n    docker-php-ext-install xdebug"
 fi
@@ -24,9 +24,8 @@ RUN apt-get update && \\
     curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \\
     composer global require 'phpunit/phpunit:^4.8|^5.0'
 
-ENV PATH ~/.composer/vendor/bin:\$PATH
-ENV TARANTOOL_HOST=tarantool
-ENV TARANTOOL_PORT=3301
+ENV PATH=~/.composer/vendor/bin:\$PATH
+ENV TARANTOOL_HOST=tarantool TARANTOOL_PORT=3301
 
-CMD if [ ! -f composer.lock ]; then composer install; fi && ~/.composer/vendor/bin/phpunit${PHPUNIT_OPTS:+ }$PHPUNIT_OPTS
+CMD if [ ! -f composer.lock ]; then composer install; fi && ~/.composer/vendor/bin/phpunit\${PHPUNIT_OPTS:+ }\$PHPUNIT_OPTS
 "