Merge pull request #62 from prolic/php_72

test php 7.2 in travis
prolic · Nov 25, 2017 · 4286672 · 4286672
2 parents 73a777b + 529cc98
commit 4286672
Show file tree

Hide file tree

Showing 31 changed files with 36 additions and 33 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,6 +5,7 @@ language: php
 php:
   - 7.0
   - 7.1
+  - 7.2
 
 services:
   - rabbitmq

diff --git a/composer.json b/composer.json
@@ -27,12 +27,12 @@
         "psr/container": "^1.0",
         "sandrokeil/interop-config": "^1.0",
         "zendframework/zend-servicemanager": "^2.7 || ^3.0",
-        "phpunit/phpunit": "^5.6",
+        "phpunit/phpunit": "^6.4",
         "phpspec/prophecy": "^1.6",
         "satooshi/php-coveralls": "^1.0",
         "php-amqplib/php-amqplib": "^2.7-rc1",
         "malukenho/docheader": "^0.1.4",
-        "friendsofphp/php-cs-fixer": "2.0.0"
+        "friendsofphp/php-cs-fixer": "2.8.1"
     },
     "conflict": {
         "sandrokeil/interop-config": "<1.0",

diff --git a/src/JsonRpc/JsonRpcResponseCollection.php b/src/JsonRpc/JsonRpcResponseCollection.php
@@ -33,7 +33,7 @@ final class JsonRpcResponseCollection implements ResponseCollection
     /**
      * @var Response[]
      */
-    private $responses;
+    private $responses = [];
 
     /**
      * @param Response $response

diff --git a/tests/AbstractCallbackConsumerTest.php b/tests/AbstractCallbackConsumerTest.php
@@ -32,13 +32,14 @@
 use HumusTest\Amqp\Helper\CanCreateConnection;
 use HumusTest\Amqp\Helper\DeleteOnTearDownTrait;
 use HumusTest\Amqp\TestAsset\ArrayLogger;
+use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
 
 /**
  * Class AbstractCallbackConsumer
  * @package HumusTest\Amqp
  */
-abstract class AbstractCallbackConsumerTest extends \PHPUnit_Framework_TestCase implements CanCreateConnection
+abstract class AbstractCallbackConsumerTest extends TestCase implements CanCreateConnection
 {
     use DeleteOnTearDownTrait;
 

diff --git a/tests/AbstractChannelRecoverTest.php b/tests/AbstractChannelRecoverTest.php
@@ -29,7 +29,7 @@
 use Humus\Amqp\Exchange;
 use Humus\Amqp\Queue;
 use HumusTest\Amqp\Helper\CanCreateConnection;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class AbstractChannelRecoverTest
@@ -85,8 +85,9 @@ public function it_recovers()
             $exchange1->publish('test message #' . $messagesCount, 'test');
         }
 
-        $consume = 2;   // NOTE: by default prefetch-count=3, so in consumer below we will ignore prefetched messages 3-5,
-                        //       and they will not seen by other consumers until we redeliver it.
+        $consume = 2;
+        // NOTE: by default prefetch-count=3, so in consumer below we will ignore prefetched messages 3-5,
+        //       and they will not seen by other consumers until we redeliver it.
 
         $queue1->consume(function (Envelope $envelope, Queue $queue) use (&$consume, &$result) {
             $result[] = 'consumed ' . $envelope->getBody() . ' '

diff --git a/tests/AbstractChannelTest.php b/tests/AbstractChannelTest.php
@@ -27,7 +27,7 @@
 use Humus\Amqp\Exchange;
 use Humus\Amqp\Queue;
 use HumusTest\Amqp\Helper\CanCreateConnection;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class AbstractChannelTest

diff --git a/tests/AbstractConnectionTest.php b/tests/AbstractConnectionTest.php
@@ -25,7 +25,7 @@
 use Humus\Amqp\Channel;
 use Humus\Amqp\ConnectionOptions;
 use HumusTest\Amqp\Helper\CanCreateConnection;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class AbstractConnectionTest

diff --git a/tests/AbstractExchangeTest.php b/tests/AbstractExchangeTest.php
@@ -32,7 +32,7 @@
 use Humus\Amqp\Queue;
 use HumusTest\Amqp\Helper\CanCreateConnection;
 use HumusTest\Amqp\Helper\DeleteOnTearDownTrait;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class AbstractExchangeTest

diff --git a/tests/AbstractJsonProducerTest.php b/tests/AbstractJsonProducerTest.php
@@ -31,7 +31,7 @@
 use Humus\Amqp\Queue;
 use HumusTest\Amqp\Helper\CanCreateConnection;
 use HumusTest\Amqp\Helper\DeleteOnTearDownTrait;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 
 /**

diff --git a/tests/AbstractPlainProducerTest.php b/tests/AbstractPlainProducerTest.php
@@ -30,7 +30,7 @@
 use Humus\Amqp\Queue;
 use HumusTest\Amqp\Helper\CanCreateConnection;
 use HumusTest\Amqp\Helper\DeleteOnTearDownTrait;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class AbstractPlainProducerTest

diff --git a/tests/AbstractQueueTest.php b/tests/AbstractQueueTest.php
@@ -32,7 +32,7 @@
 use Humus\Amqp\Queue;
 use HumusTest\Amqp\Helper\CanCreateConnection;
 use HumusTest\Amqp\Helper\DeleteOnTearDownTrait;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class AbstractQueueTest

diff --git a/tests/Console/Command/PublishMessageCommandTest.php b/tests/Console/Command/PublishMessageCommandTest.php
@@ -26,7 +26,7 @@
 use Humus\Amqp\Console\Helper\ContainerHelper;
 use Humus\Amqp\Constants;
 use Humus\Amqp\Producer;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Helper\HelperSet;

diff --git a/tests/Console/Command/PurgeQueueCommandTest.php b/tests/Console/Command/PurgeQueueCommandTest.php
@@ -27,7 +27,7 @@
 use Humus\Amqp\Console\Command\PurgeQueueCommand;
 use Humus\Amqp\Console\Helper\ContainerHelper;
 use Humus\Amqp\Queue;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Tester\CommandTester;

diff --git a/tests/Console/Command/SetupFabricCommandTest.php b/tests/Console/Command/SetupFabricCommandTest.php
@@ -28,7 +28,7 @@
 use Humus\Amqp\Console\Helper\ContainerHelper;
 use Humus\Amqp\Exchange;
 use Humus\Amqp\Queue;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Tester\CommandTester;

diff --git a/tests/Console/Command/ShowCommandTest.php b/tests/Console/Command/ShowCommandTest.php
@@ -24,7 +24,7 @@
 
 use Humus\Amqp\Console\Command\ShowCommand;
 use Humus\Amqp\Console\Helper\ContainerHelper;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Tester\CommandTester;

diff --git a/tests/Console/Command/StartCallbackConsumerCommandTest.php b/tests/Console/Command/StartCallbackConsumerCommandTest.php
@@ -25,7 +25,7 @@
 use Humus\Amqp\Console\Command\StartCallbackConsumerCommand;
 use Humus\Amqp\Console\Helper\ContainerHelper;
 use Humus\Amqp\Consumer;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Tester\CommandTester;

diff --git a/tests/Console/Command/StartJsonRpcServerCommandTest.php b/tests/Console/Command/StartJsonRpcServerCommandTest.php
@@ -25,7 +25,7 @@
 use Humus\Amqp\Console\Command\StartJsonRpcServerCommand;
 use Humus\Amqp\Console\Helper\ContainerHelper;
 use Humus\Amqp\Consumer;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Tester\CommandTester;

diff --git a/tests/Console/ConsumerRunnerTest.php b/tests/Console/ConsumerRunnerTest.php
@@ -24,7 +24,7 @@
 
 use Humus\Amqp\Console\ConsoleRunner;
 use Humus\Amqp\Console\Helper\ContainerHelper;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\Console\Helper\HelperSet;
 use Symfony\Component\Console\Tester\ApplicationTester;

diff --git a/tests/Console/Helper/ContainerHelperTest.php b/tests/Console/Helper/ContainerHelperTest.php
@@ -23,7 +23,7 @@
 namespace HumusTest\Amqp\Console\Helper;
 
 use Humus\Amqp\Console\Helper\ContainerHelper;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
 /**

diff --git a/tests/Container/CallbackConsumerFactoryTest.php b/tests/Container/CallbackConsumerFactoryTest.php
@@ -27,7 +27,7 @@
 use Humus\Amqp\Connection;
 use Humus\Amqp\Container\CallbackConsumerFactory;
 use Humus\Amqp\Queue;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 

diff --git a/tests/Container/ConnectionFactoryTest.php b/tests/Container/ConnectionFactoryTest.php
@@ -28,7 +28,7 @@
 use Humus\Amqp\Driver\PhpAmqpLib\SocketConnection;
 use Humus\Amqp\Driver\PhpAmqpLib\SslConnection;
 use Humus\Amqp\Driver\PhpAmqpLib\StreamConnection;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
 /**

diff --git a/tests/Container/DriverFactoryTest.php b/tests/Container/DriverFactoryTest.php
@@ -24,7 +24,7 @@
 
 use Humus\Amqp\Container\DriverFactory;
 use Humus\Amqp\Driver\Driver;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
 /**

diff --git a/tests/Container/ExchangeFactoryTest.php b/tests/Container/ExchangeFactoryTest.php
@@ -27,7 +27,7 @@
 use Humus\Amqp\Container\ExchangeFactory;
 use Humus\Amqp\Exception;
 use Humus\Amqp\Exchange;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
 /**

diff --git a/tests/Container/JsonRpcClientFactoryTest.php b/tests/Container/JsonRpcClientFactoryTest.php
@@ -28,7 +28,7 @@
 use Humus\Amqp\Exchange;
 use Humus\Amqp\JsonRpc\JsonRpcClient;
 use Humus\Amqp\Queue;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
 /**

diff --git a/tests/Container/JsonRpcServerFactoryTest.php b/tests/Container/JsonRpcServerFactoryTest.php
@@ -28,7 +28,7 @@
 use Humus\Amqp\Exchange;
 use Humus\Amqp\JsonRpc\JsonRpcServer;
 use Humus\Amqp\Queue;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface;
 

diff --git a/tests/Container/ProducerFactoryTest.php b/tests/Container/ProducerFactoryTest.php
@@ -28,7 +28,7 @@
 use Humus\Amqp\Exchange;
 use Humus\Amqp\JsonProducer;
 use Humus\Amqp\PlainProducer;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 
 /**

diff --git a/tests/Container/QueueFactoryTest.php b/tests/Container/QueueFactoryTest.php
@@ -28,7 +28,7 @@
 use Humus\Amqp\Exception;
 use Humus\Amqp\Exchange;
 use Humus\Amqp\Queue;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Psr\Container\ContainerInterface;
 

diff --git a/tests/JsonRpc/AbstractJsonRpcClientAndServerTest.php b/tests/JsonRpc/AbstractJsonRpcClientAndServerTest.php
@@ -38,7 +38,7 @@
 use HumusTest\Amqp\Helper\CanCreateConnection;
 use HumusTest\Amqp\Helper\DeleteOnTearDownTrait;
 use HumusTest\Amqp\TestAsset\ArrayLogger;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 use Psr\Log\NullLogger;
 
 /**

diff --git a/tests/JsonRpc/RequestTest.php b/tests/JsonRpc/RequestTest.php
@@ -24,7 +24,7 @@
 
 use Humus\Amqp\Exception\InvalidArgumentException;
 use Humus\Amqp\JsonRpc\JsonRpcRequest;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class RequestTest

diff --git a/tests/JsonRpc/ResponseCollectionTest.php b/tests/JsonRpc/ResponseCollectionTest.php
@@ -24,7 +24,7 @@
 
 use Humus\Amqp\JsonRpc\JsonRpcResponse;
 use Humus\Amqp\JsonRpc\JsonRpcResponseCollection;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ResponseCollectionTest

diff --git a/tests/JsonRpc/ResponseTest.php b/tests/JsonRpc/ResponseTest.php
@@ -25,7 +25,7 @@
 use Humus\Amqp\Exception\InvalidArgumentException;
 use Humus\Amqp\JsonRpc\JsonRpcError;
 use Humus\Amqp\JsonRpc\JsonRpcResponse;
-use PHPUnit_Framework_TestCase as TestCase;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Class ResponseTest