Merge 9f517b7 into 1702fd5

gpslab · Jan 15, 2020 · 3ee18ca · 3ee18ca
2 parents 1702fd5 + 9f517b7
commit 3ee18ca
Show file tree

Hide file tree

Showing 20 changed files with 27 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,29 +12,26 @@ branches:
 matrix:
     fast_finish: true
     include:
+        - php: 7.4
         - php: 7.3
-        - php: 7.2
         - php: 7.1
-        - php: 7.0
-        - php: 5.6
-        - php: 5.5
           dist: trusty
-        - php: 5.5
+        - php: 7.1
           dist: trusty
           env: SYMFONY_VERSION=2.7.*
-        - php: 5.5
+        - php: 7.1
           dist: trusty
           env: SYMFONY_VERSION=2.8.*
-        - php: 5.5
+        - php: 7.1
           dist: trusty
           env: SYMFONY_VERSION=3.0.*
-        - php: 5.5
+        - php: 7.1
           dist: trusty
           env: PREDIS_VERSION=1.0.*
-        - php: 5.5
+        - php: 7.1
           dist: trusty
           env: PREDIS_VERSION=1.1.*
-        - php: 5.6
+        - php: 7.2
           env: PUBSUB_PREDIS_VERSION=2.0.*
 
 before_install:

diff --git a/composer.json b/composer.json
@@ -23,15 +23,15 @@
         }
     },
     "require": {
-        "php": ">=5.5.0"
+        "php": ">=7.1.0"
     },
     "require-dev": {
         "psr/container": "~1.0",
         "psr/log": "~1.0",
         "symfony/dependency-injection": "~2.3|~3.0",
         "symfony/serializer": "~2.3|~3.0",
         "predis/predis": "~1.0|~1.1",
-        "phpunit/phpunit": "^4.8.36",
+        "phpunit/phpunit": "^7.0|^8.2",
         "scrutinizer/ocular": "~1.3",
         "php-coveralls/php-coveralls": "^1.0"
     }

diff --git a/src/Command/Queue/Pull/MemoryUniquePullCommandQueue.php b/src/Command/Queue/Pull/MemoryUniquePullCommandQueue.php
@@ -31,7 +31,7 @@ public function publish(Command $command)
         $index = array_search($command, $this->commands);
 
         // remove exists command and publish it again
-        if ($index !== false) {
+        if (false !== $index) {
             unset($this->commands[$index]);
         }
 

diff --git a/src/Command/Queue/Subscribe/ExecutingSubscribeCommandQueue.php b/src/Command/Queue/Subscribe/ExecutingSubscribeCommandQueue.php
@@ -57,7 +57,7 @@ public function unsubscribe(callable $handler)
     {
         $index = array_search($handler, $this->handlers);
 
-        if ($index === false) {
+        if (false === $index) {
             return false;
         }
 

diff --git a/src/Command/Queue/Subscribe/PredisSubscribeCommandQueue.php b/src/Command/Queue/Subscribe/PredisSubscribeCommandQueue.php
@@ -109,7 +109,7 @@ public function unsubscribe(callable $handler)
     {
         $index = array_search($handler, $this->handlers);
 
-        if ($index === false) {
+        if (false === $index) {
             return false;
         }
 

diff --git a/tests/Command/Bus/HandlerLocatedCommandBusTest.php b/tests/Command/Bus/HandlerLocatedCommandBusTest.php
@@ -32,7 +32,7 @@ class HandlerLocatedCommandBusTest extends TestCase
      */
     private $bus;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->command = $this->getMock(Command::class);
         $this->locator = $this->getMock(CommandHandlerLocator::class);

diff --git a/tests/Command/Handler/Locator/ContainerCommandHandlerLocatorTest.php b/tests/Command/Handler/Locator/ContainerCommandHandlerLocatorTest.php
@@ -39,7 +39,7 @@ class ContainerCommandHandlerLocatorTest extends TestCase
      */
     private $locator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->command = $this->getMock(Command::class);
         $this->handler = function (Command $command) {

diff --git a/tests/Command/Handler/Locator/DirectBindingCommandHandlerLocatorTest.php b/tests/Command/Handler/Locator/DirectBindingCommandHandlerLocatorTest.php
@@ -31,7 +31,7 @@ class DirectBindingCommandHandlerLocatorTest extends TestCase
      */
     private $locator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->command = $this->getMock(Command::class);
         $this->handler = function (Command $command) {

diff --git a/tests/Command/Handler/Locator/SymfonyContainerCommandHandlerLocatorTest.php b/tests/Command/Handler/Locator/SymfonyContainerCommandHandlerLocatorTest.php
@@ -39,7 +39,7 @@ class SymfonyContainerCommandHandlerLocatorTest extends TestCase
      */
     private $locator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->command = $this->getMock(Command::class);
         $this->handler = function (Command $command) {

diff --git a/tests/Command/Queue/Pull/MemoryPullCommandQueueTest.php b/tests/Command/Queue/Pull/MemoryPullCommandQueueTest.php
@@ -22,7 +22,7 @@ class MemoryPullCommandQueueTest extends TestCase
      */
     private $queue;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->queue = new MemoryPullCommandQueue();
     }

diff --git a/tests/Command/Queue/Pull/MemoryUniquePullCommandQueueTest.php b/tests/Command/Queue/Pull/MemoryUniquePullCommandQueueTest.php
@@ -22,7 +22,7 @@ class MemoryUniquePullCommandQueueTest extends TestCase
      */
     private $queue;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->queue = new MemoryUniquePullCommandQueue();
     }

diff --git a/tests/Command/Queue/Pull/PredisPullCommandQueueTest.php b/tests/Command/Queue/Pull/PredisPullCommandQueueTest.php
@@ -45,7 +45,7 @@ class PredisPullCommandQueueTest extends TestCase
      */
     private $queue_name = 'commands';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->client = $this->getMock(Client::class);
         $this->serializer = $this->getMock(Serializer::class);

diff --git a/tests/Command/Queue/Pull/PredisUniquePullCommandQueueTest.php b/tests/Command/Queue/Pull/PredisUniquePullCommandQueueTest.php
@@ -45,7 +45,7 @@ class PredisUniquePullCommandQueueTest extends TestCase
      */
     private $queue_name = 'unique_commands';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->client = $this->getMock(Client::class);
         $this->serializer = $this->getMock(Serializer::class);

diff --git a/tests/Command/Queue/Serializer/SymfonySerializerTest.php b/tests/Command/Queue/Serializer/SymfonySerializerTest.php
@@ -22,7 +22,7 @@ class SymfonySerializerTest extends TestCase
      */
     private $serializer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->serializer = $this->getMock(SerializerInterface::class);
     }

diff --git a/tests/Command/Queue/Subscribe/ExecutingSubscribeCommandQueueTest.php b/tests/Command/Queue/Subscribe/ExecutingSubscribeCommandQueueTest.php
@@ -26,7 +26,7 @@ class ExecutingSubscribeCommandQueueTest extends TestCase
      */
     private $queue;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->command = $this->getMock(Command::class);
         $this->queue = new ExecutingSubscribeCommandQueue();

diff --git a/tests/Command/Queue/Subscribe/PredisSubscribeCommandQueueTest.php b/tests/Command/Queue/Subscribe/PredisSubscribeCommandQueueTest.php
@@ -49,7 +49,7 @@ class PredisSubscribeCommandQueueTest extends TestCase
      */
     private $queue_name = 'commands';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         if (!class_exists(RedisPubSubAdapter::class)) {
             $this->markTestSkipped('php-pubsub-redis is not installed.');

diff --git a/tests/Query/Bus/HandlerLocatedQueryBusTest.php b/tests/Query/Bus/HandlerLocatedQueryBusTest.php
@@ -37,7 +37,7 @@ class HandlerLocatedQueryBusTest extends TestCase
      */
     private $bus;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->query = $this->getMock(Query::class);
         $this->handler = function (Query $query) {

diff --git a/tests/Query/Handler/Locator/ContainerQueryHandlerLocatorTest.php b/tests/Query/Handler/Locator/ContainerQueryHandlerLocatorTest.php
@@ -39,7 +39,7 @@ class ContainerQueryHandlerLocatorTest extends TestCase
      */
     private $locator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->query = $this->getMock(Query::class);
         $this->handler = function (Query $query) {

diff --git a/tests/Query/Handler/Locator/DirectBindingQueryHandlerLocatorTest.php b/tests/Query/Handler/Locator/DirectBindingQueryHandlerLocatorTest.php
@@ -31,7 +31,7 @@ class DirectBindingQueryHandlerLocatorTest extends TestCase
      */
     private $locator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->query = $this->getMock(Query::class);
         $this->handler = function (Query $query) {

diff --git a/tests/Query/Handler/Locator/SymfonyContainerQueryHandlerLocatorTest.php b/tests/Query/Handler/Locator/SymfonyContainerQueryHandlerLocatorTest.php
@@ -39,7 +39,7 @@ class SymfonyContainerQueryHandlerLocatorTest extends TestCase
      */
     private $locator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->query = $this->getMock(Query::class);
         $this->handler = function (Query $query) {