From 030cb35056f32b099c2784e883dcf9e214ececb0 Mon Sep 17 00:00:00 2001
From: Filippo Tessarotto <zoeslam@gmail.com>
Date: Wed, 28 Jun 2023 09:14:26 +0200
Subject: [PATCH] Revert "Fix PSalm issue on useless `sprintf`"

This reverts commit 0f522a5d6d35de327cb713b5b4f7984014b79814.
---
 composer.json               |  8 ++++----
 composer.lock               | 26 +++++++++++++-------------
 test/Transport/SmtpTest.php |  3 ++-
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/composer.json b/composer.json
index fd1d031c..e939b024 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
         "laminas/laminas-loader": "^2.9.0",
         "laminas/laminas-mime": "^2.11.0",
         "laminas/laminas-stdlib": "^3.17.0",
-        "laminas/laminas-validator": "^2.33.0",
+        "laminas/laminas-validator": "^2.31.0",
         "symfony/polyfill-mbstring": "^1.27.0",
         "webmozart/assert": "^1.11.0",
         "symfony/polyfill-intl-idn": "^1.27.0"
@@ -23,10 +23,10 @@
         "laminas/laminas-crypt": "^3.10.0",
         "laminas/laminas-db": "^2.18",
         "laminas/laminas-servicemanager": "^3.21",
-        "phpunit/phpunit": "^10.2.2",
+        "phpunit/phpunit": "^10.1.3",
         "psalm/plugin-phpunit": "^0.18.4",
-        "symfony/process": "^6.3.0",
-        "vimeo/psalm": "^5.13.1"
+        "symfony/process": "^6.2.10",
+        "vimeo/psalm": "^5.11"
     },
     "suggest": {
         "laminas/laminas-crypt": "^3.10 Crammd5 support in SMTP Auth",
diff --git a/composer.lock b/composer.lock
index a56e8f60..9c56aeb3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e090788d9167cf7045ddac8c94685b79",
+    "content-hash": "ff7a7449f0dedf8f339662493072a3a5",
     "packages": [
         {
             "name": "laminas/laminas-loader",
@@ -4104,16 +4104,16 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v6.3.1",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae"
+                "reference": "97b698e1d77d356304def77a8d0cd73090b359ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
-                "reference": "edd36776956f2a6fcf577edb5b05eb0e3bdc52ae",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/97b698e1d77d356304def77a8d0cd73090b359ea",
+                "reference": "97b698e1d77d356304def77a8d0cd73090b359ea",
                 "shasum": ""
             },
             "require": {
@@ -4147,7 +4147,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.3.1"
+                "source": "https://github.com/symfony/filesystem/tree/v6.3.0"
             },
             "funding": [
                 {
@@ -4163,7 +4163,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-01T08:30:39+00:00"
+            "time": "2023-05-30T17:12:32+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -4610,16 +4610,16 @@
         },
         {
             "name": "vimeo/psalm",
-            "version": "5.13.1",
+            "version": "5.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vimeo/psalm.git",
-                "reference": "086b94371304750d1c673315321a55d15fc59015"
+                "reference": "f90118cdeacd0088e7215e64c0c99ceca819e176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/086b94371304750d1c673315321a55d15fc59015",
-                "reference": "086b94371304750d1c673315321a55d15fc59015",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/f90118cdeacd0088e7215e64c0c99ceca819e176",
+                "reference": "f90118cdeacd0088e7215e64c0c99ceca819e176",
                 "shasum": ""
             },
             "require": {
@@ -4710,9 +4710,9 @@
             ],
             "support": {
                 "issues": "https://github.com/vimeo/psalm/issues",
-                "source": "https://github.com/vimeo/psalm/tree/5.13.1"
+                "source": "https://github.com/vimeo/psalm/tree/5.12.0"
             },
-            "time": "2023-06-27T16:39:49+00:00"
+            "time": "2023-05-22T21:19:03+00:00"
         },
         {
             "name": "webimpress/coding-standard",
diff --git a/test/Transport/SmtpTest.php b/test/Transport/SmtpTest.php
index 2e05dfda..88895e80 100644
--- a/test/Transport/SmtpTest.php
+++ b/test/Transport/SmtpTest.php
@@ -16,6 +16,7 @@
 use ReflectionClass;
 
 use function explode;
+use function sprintf;
 use function str_repeat;
 use function strlen;
 use function substr;
@@ -230,7 +231,7 @@ public function testLongLinesFoldingRFC5322(): void
         $this->assertCount(28, $lines);
 
         foreach ($lines as $line) {
-            $this->assertLessThanOrEqual($maxLen, strlen($line), 'Line is too long: ' . $line);
+            $this->assertLessThanOrEqual($maxLen, strlen($line), sprintf('Line is too long: ' . $line));
         }
 
         $this->assertStringNotContainsString(