Merge pull request #20 from howkey666/phpunit

Make it compatible with PHP 7.2 and 7.3

Author: howkey666

.travis.yml

@@ -1,8 +1,8 @@
 language: php
 php:
-  - 7.0
   - 7.1
-  - hhvm
+  - 7.2
+  - 7.3
 install:
   - composer install --prefer-source --no-interaction
   - wget http://download.redis.io/redis-stable.tar.gz && tar xzf redis-stable.tar.gz && cd redis-stable && make

composer.json

@@ -12,16 +12,16 @@
         }
     ],
     "require": {
-        "php": ">=7.0.0",
-        "predis/predis": "~1.1.1"
+        "php": ">=7.1.0",
+        "predis/predis": "1.1.x-dev#157f658f0be5f48cb2aaa4b6a6ac753c1168f465"
     },
     "bin": [
         "php-rq-run-tests"
     ],
     "require-dev": {
-        "phpunit/phpunit": "~6.5.13",
-        "mockery/mockery": "~0.9.4",
-        "nette/finder": "~2.4"
+        "phpunit/phpunit": "~7.5.15",
+        "mockery/mockery": "~1.2.3",
+        "nette/finder": "~2.5"
     },
     "autoload": {
         "psr-4": {

src/Pool.php

@@ -161,7 +161,7 @@ public function getItems($size)
             $since = $this->time->now() - $this->options[self::OPT_PROCESS_TIME_OFFSET];
             $chunk = $this->redis->poolGet($this->name, $size, $since, $this->options[self::OPT_ACK_TTL]);
             $result = array_merge($result, $chunk);
-            if (count($chunk) < count($size)) {
+            if (count($chunk) < $size) {
                 break;
             }
         }

tests/BaseTestCase.php

@@ -37,6 +37,8 @@ abstract class BaseTestCase extends \PHPUnit\Framework\TestCase
      */
     public function __construct(ClientInterface $redis)
     {
+        parent::__construct();
+
         $this->redis = $redis;
     }
 

tests/TestRunner.php

@@ -54,7 +54,12 @@ public function run()
                         call_user_func_array([$testCase, $methodName], (array)$args);
                     }
                 } else {
-                    $testCase = new $className($this->provider->getRedisClient());
+                    if ($className === 'PhpRQ\\BaseTest') {
+                        $testCase = new $className();
+                    } else {
+                        $testCase = new $className($this->provider->getRedisClient());
+                    }
+
                     $testCase->$methodName();
                 }
             }