Merge 093914e into 1702fd5

gpslab · Jan 15, 2020 · 25666d3 · 25666d3
2 parents 1702fd5 + 093914e
commit 25666d3
Show file tree

Hide file tree

Showing 21 changed files with 131 additions and 91 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/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
     convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false"
     bootstrap="tests/bootstrap.php"
 >
     <testsuites>

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
@@ -13,17 +13,18 @@
 use GpsLab\Component\Command\Bus\HandlerLocatedCommandBus;
 use GpsLab\Component\Command\Command;
 use GpsLab\Component\Command\Handler\Locator\CommandHandlerLocator;
+use GpsLab\Component\Command\Exception\HandlerNotFoundException;
 use PHPUnit\Framework\TestCase;
 
 class HandlerLocatedCommandBusTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|CommandHandlerLocator
+     * @var \PHPUnit\Framework\MockObject\MockObject|CommandHandlerLocator
      */
     private $locator;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Command
+     * @var \PHPUnit\Framework\MockObject\MockObject|Command
      */
     private $command;
 
@@ -32,10 +33,13 @@ 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);
+        $this->command = $this->getMockBuilder(Command::class);
+        $this->command = $this->command->getMock();
+
+        $this->locator = $this->getMockBuilder(CommandHandlerLocator::class);
+        $this->locator = $this->locator->getMock();
         $this->bus = new HandlerLocatedCommandBus($this->locator);
     }
 
@@ -57,11 +61,10 @@ public function testHandle()
         $this->assertEquals($this->command, $handled_command);
     }
 
-    /**
-     * @expectedException \GpsLab\Component\Command\Exception\HandlerNotFoundException
-     */
     public function testNoHandler()
     {
+        $this->expectException(HandlerNotFoundException::class);
+
         $this->locator
             ->expects($this->once())
             ->method('findHandler')

diff --git a/tests/Command/Handler/Locator/ContainerCommandHandlerLocatorTest.php b/tests/Command/Handler/Locator/ContainerCommandHandlerLocatorTest.php
@@ -20,12 +20,12 @@
 class ContainerCommandHandlerLocatorTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ContainerInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|ContainerInterface
      */
     private $container;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Command
+     * @var \PHPUnit\Framework\MockObject\MockObject|Command
      */
     private $command;
 
@@ -39,13 +39,16 @@ class ContainerCommandHandlerLocatorTest extends TestCase
      */
     private $locator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->command = $this->getMock(Command::class);
+        $this->command = $this->getMockBuilder(Command::class);
+        $this->command = $this->command->getMock();
+
         $this->handler = function (Command $command) {
             $this->assertEquals($command, $this->command);
         };
-        $this->container = $this->getMock(ContainerInterface::class);
+        $this->container = $this->getMockBuilder(ContainerInterface::class);
+        $this->container = $this->container->getMock();
 
         $this->locator = new ContainerCommandHandlerLocator($this->container);
     }

diff --git a/tests/Command/Handler/Locator/DirectBindingCommandHandlerLocatorTest.php b/tests/Command/Handler/Locator/DirectBindingCommandHandlerLocatorTest.php
@@ -17,7 +17,7 @@
 class DirectBindingCommandHandlerLocatorTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Command
+     * @var \PHPUnit\Framework\MockObject\MockObject|Command
      */
     private $command;
 
@@ -31,9 +31,11 @@ class DirectBindingCommandHandlerLocatorTest extends TestCase
      */
     private $locator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->command = $this->getMock(Command::class);
+        $this->command = $this->getMockBuilder(Command::class);
+        $this->command = $this->command->getMock();
+
         $this->handler = function (Command $command) {
             $this->assertEquals($command, $this->command);
         };

diff --git a/tests/Command/Handler/Locator/SymfonyContainerCommandHandlerLocatorTest.php b/tests/Command/Handler/Locator/SymfonyContainerCommandHandlerLocatorTest.php
@@ -20,12 +20,12 @@
 class SymfonyContainerCommandHandlerLocatorTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ContainerInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|ContainerInterface
      */
     private $container;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Command
+     * @var \PHPUnit\Framework\MockObject\MockObject|Command
      */
     private $command;
 
@@ -39,13 +39,16 @@ class SymfonyContainerCommandHandlerLocatorTest extends TestCase
      */
     private $locator;
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->command = $this->getMock(Command::class);
+        $this->command = $this->getMockBuilder(Command::class);
+        $this->command = $this->command->getMock();
+
         $this->handler = function (Command $command) {
             $this->assertEquals($command, $this->command);
         };
-        $this->container = $this->getMock(ContainerInterface::class);
+        $this->container = $this->getMockBuilder(ContainerInterface::class);
+        $this->container = $this->container->getMock();
 
         $this->locator = new SymfonyContainerCommandHandlerLocator();
     }

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
@@ -21,17 +21,17 @@
 class PredisPullCommandQueueTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Client
+     * @var \PHPUnit\Framework_MockObject\MockObject|Client
      */
     private $client;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Serializer
+     * @var \PHPUnit\Framework\MockObject\MockObject|Serializer
      */
     private $serializer;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|LoggerInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|LoggerInterface
      */
     private $logger;
 
@@ -45,11 +45,17 @@ 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);
-        $this->logger = $this->getMock(LoggerInterface::class);
+        $this->client = $this->getMockBuilder(Client::class);
+        $this->client = $this->client->getMock();
+
+        $this->serializer = $this->getMockBuilder(Serializer::class);
+        $this->serializer = $this->serializer->getMock();
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class);
+        $this->logger = $this->logger->getMock();
+
         $this->queue = new PredisPullCommandQueue($this->client, $this->serializer, $this->logger, $this->queue_name);
     }
 

diff --git a/tests/Command/Queue/Pull/PredisUniquePullCommandQueueTest.php b/tests/Command/Queue/Pull/PredisUniquePullCommandQueueTest.php
@@ -21,17 +21,17 @@
 class PredisUniquePullCommandQueueTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Client
+     * @var \PHPUnit\Framework\MockObject\MockObject|Client
      */
     private $client;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Serializer
+     * @var \PHPUnit\Framework\MockObject\MockObject|Serializer
      */
     private $serializer;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|LoggerInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|LoggerInterface
      */
     private $logger;
 
@@ -45,11 +45,17 @@ 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);
-        $this->logger = $this->getMock(LoggerInterface::class);
+        $this->client = $this->getMockBuilder(Client::class);
+        $this->client = $this->client->getMock();
+
+        $this->serializer = $this->getMockBuilder(Serializer::class);
+        $this->serializer = $this->serializer->getMock();
+
+        $this->logger = $this->getMockBuilder(LoggerInterface::class);
+        $this->logger = $this->logger->getMock();
+
         $this->queue = new PredisUniquePullCommandQueue(
             $this->client,
             $this->serializer,

diff --git a/tests/Command/Queue/Serializer/SymfonySerializerTest.php b/tests/Command/Queue/Serializer/SymfonySerializerTest.php
@@ -18,13 +18,14 @@
 class SymfonySerializerTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|SerializerInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|SerializerInterface
      */
     private $serializer;
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->serializer = $this->getMock(SerializerInterface::class);
+        $this->serializer = $this->getMockBuilder(SerializerInterface::class);
+        $this->serializer = $this->serializer->getMock();
     }
 
     /**

diff --git a/tests/Command/Queue/Subscribe/ExecutingSubscribeCommandQueueTest.php b/tests/Command/Queue/Subscribe/ExecutingSubscribeCommandQueueTest.php
@@ -17,7 +17,7 @@
 class ExecutingSubscribeCommandQueueTest extends TestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Command
+     * @var \PHPUnit\Framework\MockObject\MockObject|Command
      */
     private $command;
 
@@ -26,9 +26,11 @@ class ExecutingSubscribeCommandQueueTest extends TestCase
      */
     private $queue;
 
-    protected function setUp()
+    protected function setUp(): void
     {
-        $this->command = $this->getMock(Command::class);
+        $this->command = $this->getMockBuilder(Command::class);
+        $this->command = $this->command->getMock();
+
         $this->queue = new ExecutingSubscribeCommandQueue();
     }