From e676dc7c607c51e1d637d0783e75b4716e4e1abf Mon Sep 17 00:00:00 2001
From: Christoph Quadt <christoph@quadtrilogy.de>
Date: Wed, 16 Jun 2021 11:55:31 +0200
Subject: [PATCH] Make adapter compatible with PHP8 (#22)

* Added missing properties to Symfonys FlattenException.

* Added symfony 5.1.

* The throwable is an interface, we need a concrete implementation.

* Made package php8 compatible and updated packages.

* Added php8 to tests.

* We want to make it compatible only to php7.4 and 8.0.c

* PHPUnit has to be on 8.* for php 7.2.

* Try to widen the matrix.

* All e2e tests are allowed to fail.

* Modified deprecated classes.

* Added php-coveralls for composer.

Co-authored-by: Christoph Quadt <quadt@united-domains.de>
---
 .travis.yml                                   | 20 ++++++---------
 Makefile                                      |  4 ---
 composer.json                                 | 25 ++++++++++---------
 .../Context/JMSMessengerAdapterContext.php    |  3 +--
 4 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f4649d1..d866d1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,24 +7,18 @@ services:
 php:
   - '7.2'
   - '7.3'
-  - 7.4snapshot
+  - '7.4'
+  - '8.0'
 
 env:
-  global:
-    - TARGET=unit
+  - TARGET=unit
+  - TARGET=unit COMPOSER_FLAGS='--prefer-lowest'
+  - TARGET=e2e
+  - TARGET=coverage
 
-matrix:
+jobs:
   fast_finish: true
-  include:
-    - php: '7.2'
-      env: TARGET=unit COMPOSER_FLAGS='--prefer-lowest'
-    - php: '7.2'
-      env: TARGET=e2e
-    - php: '7.2'
-      env: TARGET=coverage
-
   allow_failures:
-    - php: 7.4snapshot
     - env: TARGET=e2e
 
 before_install:
diff --git a/Makefile b/Makefile
index 01386dc..3bbaedc 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,5 @@ unit:
 .PHONY: unit
 
 coverage:
-	mkdir --parents "${HOME}/bin"
-	wget https://github.com/satooshi/php-coveralls/releases/download/v1.0.1/coveralls.phar --output-document="${HOME}/bin/coveralls"
-	chmod u+x "${HOME}/bin/coveralls"
 	bin/phpunit --colors --coverage-clover build/logs/clover.xml
-	coveralls -v
 .PHONY: coverage
diff --git a/composer.json b/composer.json
index 0c328fd..697ab6d 100644
--- a/composer.json
+++ b/composer.json
@@ -20,21 +20,22 @@
         }
     ],
     "require": {
-        "php": "^7.2",
-        "jms/serializer": "^2.1 || ^3.0",
-        "symfony/messenger": "^4.4 || ^5.1"
+        "php": "^7.2 || ^8.0",
+        "jms/serializer": "^2.3 || ^3.9",
+        "symfony/messenger": "^4.4 || ^5.3"
     },
     "require-dev": {
-        "behat/behat": "^3.5",
+        "behat/behat": "^3.6",
         "behat/symfony2-extension": "^2.1",
-        "jms/serializer-bundle": "^3.1",
-        "matthiasnoback/symfony-dependency-injection-test": "^3.0",
-        "phpunit/phpunit": "^7.4",
-        "symfony/config": "^4.4 || ^5.1",
-        "symfony/debug": "^4.4 || ^5.1",
-        "symfony/dependency-injection": "^4.4 || ^5.1",
-        "symfony/framework-bundle": "^4.4 || ^5.1",
-        "symfony/http-kernel": "^4.4 || ^5.1"
+        "jms/serializer-bundle": "^3.9",
+        "matthiasnoback/symfony-dependency-injection-test": "dev-master",
+        "php-coveralls/php-coveralls": "^2.4",
+        "phpunit/phpunit": "^8.5 || ^9.5",
+        "symfony/config": "^4.4 || ^5.3",
+        "symfony/debug": "^4.4 || ^5.3",
+        "symfony/dependency-injection": "^4.4 || ^5.3",
+        "symfony/framework-bundle": "^4.4 || ^5.3",
+        "symfony/http-kernel": "^4.4 || ^5.3"
     },
     "config": {
         "bin-dir": "bin",
diff --git a/features/Context/JMSMessengerAdapterContext.php b/features/Context/JMSMessengerAdapterContext.php
index 570e76c..dc56394 100644
--- a/features/Context/JMSMessengerAdapterContext.php
+++ b/features/Context/JMSMessengerAdapterContext.php
@@ -6,10 +6,10 @@
 use Behat\Symfony2Extension\Context\KernelDictionary;
 use PHPUnit\Framework\Assert;
 use Psr\Container\ContainerInterface;
+use Symfony\Component\Messenger\Bridge\Amqp\Transport\AmqpTransport;
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 use KunicMarko\JMSMessengerAdapter\Features\Fixtures\Project\Query\DoesItWork;
-use Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransport;
 
 class JMSMessengerAdapterContext implements Context
 {
@@ -65,7 +65,6 @@ public function iDispatchAQueryWithGroup()
      */
     public function iShouldGetAResponse()
     {
-
         $transport = $this->receiverLocator->get('amqp');
 
         \assert($transport instanceof AmqpTransport);