MyOnlineStore · fred-jan · Mar 18, 2022 · Mar 16, 2022 · Mar 17, 2022
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -0,0 +1,7 @@
+version: 2
+
+updates:
+    -   package-ecosystem: 'github-actions'
+        directory: '/'
+        schedule:
+            interval: 'daily'
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -0,0 +1,39 @@
+name: Test
+
+on: push
+
+jobs:
+    setup:
+        runs-on: ubuntu-latest
+        steps:
+            -   uses: actions/checkout@v2
+            -   uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 7.4
+                    coverage: none
+            -   uses: ramsey/composer-install@v2
+            -   id: set-php-versions
+                run: echo "::set-output name=php-versions::$(vendor/bin/devtools list:php-versions)"
+            -   id: set-tools
+                run: echo "::set-output name=tools::$(vendor/bin/devtools list:enabled-tools)"
+        outputs:
+            php-versions: ${{ steps.set-php-versions.outputs.php-versions }}
+            tools: ${{ steps.set-tools.outputs.tools }}
+
+    test:
+        needs: setup
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                php-version: ${{ fromJson(needs.setup.outputs.php-versions) }}
+                tool: ${{ fromJson(needs.setup.outputs.tools) }}
+            fail-fast: false
+        steps:
+            -   uses: actions/checkout@v2
+            -   uses: shivammathur/setup-php@v2
+                with:
+                    php-version: ${{ matrix.php-version }}
+                    ini-values: assert.exception=1, zend.assertions=1
+            -   uses: ramsey/composer-install@v2
+
+            -   run: vendor/bin/devtools ${{ matrix.tool }}
diff --git a/composer.json b/composer.json
@@ -5,7 +5,10 @@
     "homepage": "https://github.com/MyOnlineStore/symfony-messenger-serializer",
     "license": "MIT",
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "autoload": {
         "psr-4": {
@@ -18,15 +21,17 @@
         }
     },
     "require": {
-        "php": "^7.2|^8.0",
-        "symfony/messenger": "^4.4|^5.2",
-        "symfony/serializer": "^4.4|^5.2",
+        "php": "^7.4|^8.0",
+        "ext-json": "*",
+        "symfony/messenger": "^5.4 || ^6.0",
+        "symfony/serializer": "^5.4 || ^6.0",
         "webmozart/assert": "^1.10"
     },
     "require-dev": {
         "myonlinestore/coding-standard": "^3.1",
-        "phpunit/phpunit": "^8.5|^9.5",
-        "vimeo/psalm": "^4.7"
+        "myonlinestore/php-devtools": "^0.2.0",
+        "phpunit/phpunit": "^9.5",
+        "vimeo/psalm": "^4.22"
     },
     "suggest": {
         "koco/messenger-kafka": "^0.14; Symfony Messenger Kafka adapter"

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <psalm errorLevel="1"
-       totallyTyped="true"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns="https://getpsalm.org/schema/config"
        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

diff --git a/src/KafkaMessageSerializer.php b/src/KafkaMessageSerializer.php
@@ -7,26 +7,18 @@
 use Symfony\Component\Messenger\Transport\Serialization\SerializerInterface;
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
+use Symfony\Component\Serializer\Encoder\JsonEncode;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 final class KafkaMessageSerializer implements SerializerInterface
 {
-    /** @var DecoderInterface */
-    private $decoder;
-
-    /** @var DenormalizerInterface */
-    private $denormalizer;
-
-    /** @var EncoderInterface */
-    private $encoder;
-
-    /** @var MessageNameMapper */
-    private $messageNameMapper;
-
-    /** @var NormalizerInterface */
-    private $normalizer;
+    private DecoderInterface $decoder;
+    private DenormalizerInterface $denormalizer;
+    private EncoderInterface $encoder;
+    private MessageNameMapper $messageNameMapper;
+    private NormalizerInterface $normalizer;
 
     public function __construct(
         DecoderInterface $decoder,
@@ -103,7 +95,10 @@ public function encode(Envelope $envelope): array
             ],
             'body' => $this->encoder->encode(
                 $this->normalizer->normalize($message, $messageName),
-                'json'
+                'json',
+                [
+                    JsonEncode::OPTIONS =>  \JSON_UNESCAPED_SLASHES,
+                ]
             ),
             'timestamp_ms' => $message instanceof TimestampAwareMessage ?
                 $message->getTimestamp() :

diff --git a/src/MessageName.php b/src/MessageName.php
@@ -10,11 +10,8 @@
  */
 final class MessageName
 {
-    /** @var string */
-    private $name;
-
-    /** @var string */
-    private $version;
+    private string $name;
+    private string $version;
 
     private function __construct(string $name, string $version)
     {

diff --git a/src/UnmappedMessage.php b/src/UnmappedMessage.php
@@ -8,14 +8,10 @@
  */
 final class UnmappedMessage
 {
-    /** @var string */
-    public $key;
-
+    public string $key;
     /** @var array<string, string> */
-    public $headers;
-
-    /** @var string */
-    public $body;
+    public array $headers;
+    public string $body;
 
     /**
      * @param array<string, string> $headers

diff --git a/tests/KafkaMessageSerializerTest.php b/tests/KafkaMessageSerializerTest.php
@@ -15,6 +15,7 @@
 use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Serializer\Encoder\DecoderInterface;
 use Symfony\Component\Serializer\Encoder\EncoderInterface;
+use Symfony\Component\Serializer\Encoder\JsonEncode;
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
@@ -142,7 +143,7 @@ public function testEncode(): void
 
         $this->encoder->expects(self::once())
             ->method('encode')
-            ->with(['normalized-message'], 'json')
+            ->with(['normalized-message'], 'json', [JsonEncode::OPTIONS => \JSON_UNESCAPED_SLASHES])
             ->willReturn('{"normalized-message"}');
 
         self::assertEquals(
@@ -182,7 +183,7 @@ public function testEncodeWithTimestamp(): void
 
         $this->encoder->expects(self::once())
             ->method('encode')
-            ->with(['normalized-message'], 'json')
+            ->with(['normalized-message'], 'json', [JsonEncode::OPTIONS => \JSON_UNESCAPED_SLASHES])
             ->willReturn('{"normalized-message"}');
 
         self::assertEquals(