Symfony 5

.travis.yml

@@ -7,39 +7,42 @@ matrix:
   include:
     - php: 7.1
       sudo: false
-      env: SYMFONY_VERSION=3.4.* PHPSTAN=true
+      env: SYMFONY_VERSION=4.3.* PHPSTAN=true
     - php: 7.1
       sudo: false
-      env: SYMFONY_VERSION=3.4.* PHP_CS_FIXER=true
+      env: SYMFONY_VERSION=4.3.* PHP_CS_FIXER=true
     - php: 7.1
       sudo: false
-      env: SYMFONY_VERSION=3.4.* UNIT_TESTS=true
-    - php: 7.1
+      env: SYMFONY_VERSION=4.3.* UNIT_TESTS=true
+    - php: 7.2
       sudo: false
-      env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
+      env: SYMFONY_VERSION=4.3.* UNIT_TESTS=true
     - php: 7.2
       sudo: false
-      env: SYMFONY_VERSION=4.0.* UNIT_TESTS=true
+      env: SYMFONY_VERSION=5.0.* UNIT_TESTS=true
     - php: 7.3
       sudo: false
-      env: SYMFONY_VERSION=4.1.* UNIT_TESTS=true
+      env: SYMFONY_VERSION=4.3.* UNIT_TESTS=true
     - php: 7.3
       sudo: false
-      env: SYMFONY_VERSION=4.2.* UNIT_TESTS=true
+      env: SYMFONY_VERSION=4.4.* UNIT_TESTS=true
+    - php: 7.3
+      sudo: false
+      env: SYMFONY_VERSION=5.0.* UNIT_TESTS=true
     - php: 7.1
-      services: docker
       sudo: required
-      env: SYMFONY_VERSION=3.4.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
-    - php: 7.1
+      services: docker
+      env: SYMFONY_VERSION=4.3.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
+    - php: 7.3
       sudo: required
       services: docker
-      env: SYMFONY_VERSION=4.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
+      env: SYMFONY_VERSION=5.0.* FUNCTIONAL_TESTS=true PREPARE_CONTAINER=true
     - php: 7.1
       sudo: required
       services: docker
-      env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
+      env: SYMFONY_VERSION=4.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
   allow_failures:
-    - env: SYMFONY_VERSION=3.4.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
+    - env: SYMFONY_VERSION=4.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
 
 cache:
     directories:
@@ -66,12 +69,12 @@ script:
     - if [ "$UNIT_TESTS" = true ]; then bin/phpunit --exclude-group=functional; fi
     - if [ "$FUNCTIONAL_TESTS" = true ]; then bin/test.sh --exclude-group=rdkafka; fi
     - if [ "RDKAFKA_TESTS" = true ]; then bin/test.sh --group=rdkafka; fi
-    
+
 notifications:
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/3f8b3668e7792de23a49
-    on_success: change  
-    on_failure: always  
-    on_start: never     
+    on_success: change
+    on_failure: always
+    on_start: never
 

composer.json

@@ -13,7 +13,7 @@
 
     "ext-amqp": "^1.9.3",
     "ext-gearman": "^2.0",
-    "ext-mongodb": "^1.3",
+    "ext-mongodb": "^1.5",
     "ext-rdkafka": "^3.0.3",
 
     "queue-interop/amqp-interop": "^0.8",
@@ -35,14 +35,14 @@
     "php-http/client-common": "^1.7@dev",
     "richardfullmer/rabbitmq-management-api": "^2.0",
     "predis/predis": "^1.1",
+    "thruway/client": "^0.5.0",
     "thruway/pawl-transport": "^0.5.0",
-    "voryx/thruway": "^0.5.3",
     "influxdb/influxdb-php": "^1.14",
     "datadog/php-datadogstatsd": "^1.3"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.5",
-    "phpstan/phpstan": "^0.10",
+    "phpunit/phpunit": "^7.5",
+    "phpstan/phpstan": "^0.12",
     "queue-interop/queue-spec": "^0.6",
     "symfony/browser-kit": "^3.4|^4",
     "symfony/config": "^3.4|^4",
@@ -54,9 +54,10 @@
     "symfony/http-kernel": "^3.4|^4",
     "symfony/filesystem": "^3.4|^4",
     "symfony/framework-bundle": "^3.4|^4",
+    "symfony/yaml": "^4.3|^5",
     "empi89/php-amqp-stubs": "*@dev",
-    "doctrine/doctrine-bundle": "~1.2",
-    "doctrine/mongodb-odm-bundle": "^3.5",
+    "doctrine/doctrine-bundle": "~1.2|^2",
+    "doctrine/mongodb-odm-bundle": "^3.5|^4",
     "alcaeus/mongo-php-adapter": "^1.0",
     "kwn/php-rdkafka-stubs": "^1.0.2",
     "friendsofphp/php-cs-fixer": "^2"
@@ -112,7 +113,7 @@
       "ext-amqp": "1.9.3",
       "ext-gearman": "2.0.3",
       "ext-rdkafka": "3.3",
-      "ext-mongodb": "1.3",
+      "ext-mongodb": "1.5",
       "ext-bcmath": "1",
       "ext-mbstring": "1",
       "ext-mongo": "1.6.14"

docker-compose.yml

@@ -117,15 +117,9 @@ services:
         - "27017:27017"
 
   thruway:
-    image: formapro/nginx-php-fpm:latest-all-exts
+    build: './docker/thruway'
     ports:
       - '9090:9090'
-    working_dir: '/app'
-    volumes:
-      - './:/app'
-    entrypoint:
-        - '/usr/bin/php'
-        - 'docker/thruway/WsRouter.php'
 
   localstack:
     image: 'localstack/localstack:latest'

docker/thruway/Dockerfile

@@ -0,0 +1,13 @@
+FROM formapro/nginx-php-fpm:latest-all-exts
+
+RUN mkdir -p /thruway
+WORKDIR /thruway
+
+# Thruway router
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+RUN COMPOSER_HOME=/thruway composer global require --prefer-dist --no-scripts voryx/thruway
+
+COPY WsRouter.php .
+
+CMD ["/usr/bin/php", "WsRouter.php"]
+

docker/thruway/WsRouter.php

@@ -1,6 +1,6 @@
 <?php
 
-require __DIR__.'/../../vendor/autoload.php';
+require __DIR__.'/vendor/autoload.php';
 
 use Thruway\Peer\Router;
 use Thruway\Transport\RatchetTransportProvider;

docs/monitoring.md

@@ -294,7 +294,7 @@ There are available options (and all available metrics):
 Install additional packages:
 
 ```
-composer req thruway/pawl-transport:^0.5.0 voryx/thruway:^0.5.3
+composer req thruway/pawl-transport:^0.5.0 thruway/client:^0.5.0
 ```
 
 ```php

docs/transport/wamp.md

@@ -10,7 +10,7 @@ nav_order: 3
 
 A transport for [Web Application Messaging Protocol](https://wamp-proto.org/).
 WAMP is an open standard WebSocket subprotocol.
-It uses internally Thruway PHP library [voryx/thruway](https://github.com/voryx/Thruway)
+It uses internally Thruway PHP library [thruway/client](https://github.com/thruway/client)
 
 * [Installation](#installation)
 * [Start the WAMP router](#start-the-wamp-router)
@@ -27,7 +27,10 @@ $ composer require enqueue/wamp
 
 ## Start the WAMP router
 
+You can get a WAMP router with [Thruway](https://github.com/voryx/Thruway):
+
 ```bash
+$ composer require voryx/thruway
 $ php vendor/voryx/thruway/Examples/SimpleWsRouter.php
 ```
 

phpstan.neon

@@ -14,3 +14,10 @@ parameters:
 		- pkg/enqueue-bundle/DependencyInjection/Configuration.php
 		- pkg/enqueue/Tests/Symfony/DependencyInjection/TransportFactoryTest.php
 		- pkg/simple-client/SimpleClient.php
+	ignoreErrors:
+		-
+			message: '#Class Symfony\\Component\\EventDispatcher\\LegacyEventDispatcherProxy not found#'
+			path: %currentWorkingDirectory%/*
+		-
+			message: '#.*Symfony\\Contracts\\EventDispatcher\\Event.*#'
+			path: %currentWorkingDirectory%/*

phpunit.xml.dist

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="./vendor/autoload.php"
         >
 

pkg/amqp-bunny/Tests/AmqpConsumerTest.php

@@ -14,6 +14,7 @@
 use Interop\Amqp\Impl\AmqpQueue;
 use Interop\Queue\Consumer;
 use Interop\Queue\Exception\InvalidMessageException;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class AmqpConsumerTest extends TestCase
@@ -205,23 +206,23 @@ public function testShouldReturnMessageOnReceiveWithReceiveMethodBasicGet()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Client
+     * @return MockObject|Client
      */
     public function createClientMock()
     {
         return $this->createMock(Client::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|AmqpContext
+     * @return MockObject|AmqpContext
      */
     public function createContextMock()
     {
         return $this->createMock(AmqpContext::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Channel
+     * @return MockObject|Channel
      */
     public function createBunnyChannelMock()
     {

pkg/amqp-bunny/Tests/AmqpContextTest.php

@@ -9,6 +9,7 @@
 use Interop\Amqp\Impl\AmqpBind;
 use Interop\Amqp\Impl\AmqpQueue;
 use Interop\Amqp\Impl\AmqpTopic;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class AmqpContextTest extends TestCase
@@ -244,7 +245,7 @@ public function testShouldReturnExpectedSubscriptionConsumerInstance()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Channel
+     * @return MockObject|Channel
      */
     public function createChannelMock()
     {

pkg/amqp-bunny/Tests/AmqpProducerTest.php

@@ -17,6 +17,7 @@
 use Interop\Queue\Exception\InvalidMessageException;
 use Interop\Queue\Message;
 use Interop\Queue\Producer;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class AmqpProducerTest extends TestCase
@@ -200,39 +201,39 @@ public function testShouldPropagateFlags()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Message
+     * @return MockObject|Message
      */
     private function createMessageMock()
     {
         return $this->createMock(Message::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Destination
+     * @return MockObject|Destination
      */
     private function createDestinationMock()
     {
         return $this->createMock(Destination::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|Channel
+     * @return MockObject|Channel
      */
     private function createBunnyChannelMock()
     {
         return $this->createMock(Channel::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|AmqpContext
+     * @return MockObject|AmqpContext
      */
     private function createContextMock()
     {
         return $this->createPartialMock(AmqpContext::class, []);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|DelayStrategy
+     * @return MockObject|DelayStrategy
      */
     private function createDelayStrategyMock()
     {

pkg/amqp-bunny/Tests/AmqpSubscriptionConsumerTest.php

@@ -5,6 +5,7 @@
 use Enqueue\AmqpBunny\AmqpContext;
 use Enqueue\AmqpBunny\AmqpSubscriptionConsumer;
 use Interop\Queue\SubscriptionConsumer;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class AmqpSubscriptionConsumerTest extends TestCase
@@ -22,7 +23,7 @@ public function testCouldBeConstructedWithAmqpContextAsFirstArgument()
     }
 
     /**
-     * @return AmqpContext|\PHPUnit_Framework_MockObject_MockObject
+     * @return AmqpContext|MockObject
      */
     private function createAmqpContextMock()
     {

pkg/amqp-bunny/Tests/Spec/AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest.php

@@ -13,7 +13,7 @@
  */
 class AmqpSubscriptionConsumerConsumeUntilUnsubscribedTest extends SubscriptionConsumerConsumeUntilUnsubscribedSpec
 {
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if ($this->subscriptionConsumer) {
             $this->subscriptionConsumer->unsubscribeAll();

pkg/amqp-bunny/phpunit.xml.dist

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="./vendor/autoload.php"
         >
 

pkg/amqp-ext/Tests/AmqpConsumerTest.php

@@ -7,6 +7,7 @@
 use Enqueue\Test\ClassExtensionTrait;
 use Interop\Amqp\Impl\AmqpQueue;
 use Interop\Queue\Consumer;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class AmqpConsumerTest extends TestCase
@@ -24,7 +25,7 @@ public function testCouldBeConstructedWithContextAndQueueAsArguments()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|AmqpContext
+     * @return MockObject|AmqpContext
      */
     private function createContext()
     {

pkg/amqp-ext/Tests/AmqpContextTest.php

@@ -14,6 +14,7 @@
 use Interop\Amqp\Impl\AmqpTopic;
 use Interop\Queue\Context;
 use Interop\Queue\Exception\InvalidDestinationException;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
 class AmqpContextTest extends TestCase
@@ -243,15 +244,15 @@ public function testShouldReturnExpectedSubscriptionConsumerInstance()
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\AMQPChannel
+     * @return MockObject|\AMQPChannel
      */
     private function createExtChannelMock()
     {
         return $this->createMock(\AMQPChannel::class);
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|\AMQPChannel
+     * @return MockObject|\AMQPChannel
      */
     private function createExtConnectionMock()
     {