From 4956caa2a5e8df120f712ad6d895c6ffba78ecc1 Mon Sep 17 00:00:00 2001
From: Geert Eltink <9497586+geerteltink@users.noreply.github.com>
Date: Fri, 24 Dec 2021 10:26:37 +0100
Subject: [PATCH] feat: only support symfony ^5.4 and ^6.0 (#69)

* build(deps): only support symfony ^5.4 and ^6.0
* style: fix coding style
---
 composer.json                                 | 36 +++++++++----------
 .../SymfonySerializerFactoryTest.php          |  4 +--
 test/SerializerTest.php                       |  4 +--
 test/TransportTest.php                        | 16 +++++----
 4 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/composer.json b/composer.json
index 5f45c82..0a6cb2f 100644
--- a/composer.json
+++ b/composer.json
@@ -11,29 +11,29 @@
     ],
     "require": {
         "php": "^7.4 || ^8.0",
-        "psr/container": "^1.0",
-        "symfony/amqp-messenger": "^5.1",
-        "symfony/doctrine-messenger": "^5.1",
-        "symfony/event-dispatcher": "^5.1",
-        "symfony/messenger": "^5.1",
-        "symfony/redis-messenger": "^5.1"
+        "psr/container": "^1.0 || ^2.0",
+        "symfony/amqp-messenger": "^5.4 || ^6.0",
+        "symfony/doctrine-messenger": "^5.4 || ^6.0",
+        "symfony/event-dispatcher": "^5.4 || ^6.0",
+        "symfony/messenger": "^5.4 || ^6.0",
+        "symfony/redis-messenger": "^5.4 || ^6.0"
     },
     "require-dev": {
         "ext-json": "*",
-        "doctrine/dbal": "^2.6",
-        "doctrine/orm": "^2.6",
-        "laminas/laminas-auradi-config": "^2.0",
-        "laminas/laminas-coding-standard": "^2.0",
-        "laminas/laminas-pimple-config": "^1.1",
-        "laminas/laminas-servicemanager": "^3.4",
+        "doctrine/dbal": "^2.13 || ^3.2",
+        "doctrine/orm": "^2.10",
+        "laminas/laminas-auradi-config": "^2.2",
+        "laminas/laminas-coding-standard": "^2.3",
+        "laminas/laminas-pimple-config": "^1.4",
+        "laminas/laminas-servicemanager": "^3.10.0",
         "phpunit/phpunit": "^9.5",
         "psalm/plugin-phpunit": "^0.12.0",
-        "psr/log": "^1.1",
-        "symfony/console": "^4.4 || ^5.0",
-        "symfony/contracts": "^1.1 || ^2.0",
-        "symfony/property-access": "^4.4 || ^5.0",
-        "symfony/serializer": "^4.4 || ^5.0",
-        "vimeo/psalm": "^3.10"
+        "psr/log": "^1.1 || ^2.0 || ^3.0",
+        "symfony/console": "^5.4 || ^6.0",
+        "symfony/contracts": "^2.0 || ^3.0",
+        "symfony/property-access": "^5.4 || ^6.0",
+        "symfony/serializer": "^5.4 || ^6.0",
+        "vimeo/psalm": "^3.18"
     },
     "suggest": {
         "laminas/laminas-cli": "For auto configuring the cli command.",
diff --git a/test/Serializer/SymfonySerializerFactoryTest.php b/test/Serializer/SymfonySerializerFactoryTest.php
index e6ba9cc..504c9d3 100644
--- a/test/Serializer/SymfonySerializerFactoryTest.php
+++ b/test/Serializer/SymfonySerializerFactoryTest.php
@@ -4,11 +4,11 @@
 
 namespace Xtreamwayz\PsrContainerMessenger\Test\Serializer;
 
+use Laminas\ServiceManager\Config;
+use Laminas\ServiceManager\ServiceManager;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Transport\Serialization\Serializer;
 use Xtreamwayz\PsrContainerMessenger\ConfigProvider;
-use Zend\ServiceManager\Config;
-use Zend\ServiceManager\ServiceManager;
 
 use function array_replace_recursive;
 
diff --git a/test/SerializerTest.php b/test/SerializerTest.php
index a3111b5..0ffdb24 100644
--- a/test/SerializerTest.php
+++ b/test/SerializerTest.php
@@ -4,11 +4,11 @@
 
 namespace Xtreamwayz\PsrContainerMessenger\Test;
 
+use Laminas\ServiceManager\Config;
+use Laminas\ServiceManager\ServiceManager;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Xtreamwayz\PsrContainerMessenger\ConfigProvider;
-use Zend\ServiceManager\Config;
-use Zend\ServiceManager\ServiceManager;
 
 use function array_replace_recursive;
 
diff --git a/test/TransportTest.php b/test/TransportTest.php
index 638a147..cf1b670 100644
--- a/test/TransportTest.php
+++ b/test/TransportTest.php
@@ -38,11 +38,15 @@ public function testItCanSendAndReceiveMessages(): void
 
         $transport = $this->getContainer()->get('in-memory-transport');
 
-        $message  = new DummyMessage('Hello');
-        $envelope = new Envelope($message);
-        $result   = $transport->send($envelope);
-
-        $this->assertEquals($result, $envelope);
-        $this->assertSame([$envelope], $transport->get());
+        $message         = new DummyMessage('Hello');
+        $envelope        = new Envelope($message);
+        $result          = $transport->send($envelope);
+        $messages        = $transport->get();
+        $receivedMessage = $messages[0];
+
+        $this->assertInstanceOf(Envelope::class, $result);
+        $this->assertCount(1, $messages);
+        $this->assertInstanceOf(Envelope::class, $receivedMessage);
+        $this->assertInstanceOf(DummyMessage::class, $receivedMessage->getMessage());
     }
 }