Merge branch '5.4' into 6.0

* 5.4:
  [Mime] Rename SMimeEncryptorTest to SMimeEncrypterTest
  Run tests with doctrine/collections 2

Author: nicolas-grekas

composer.json

@@ -122,7 +122,7 @@
         "async-aws/sns": "^1.0",
         "cache/integration-tests": "dev-master",
         "doctrine/annotations": "^1.13.1",
-        "doctrine/collections": "~1.0",
+        "doctrine/collections": "^1.0|^2.0",
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^2.13.1|^3.0",
         "doctrine/orm": "^2.7.4",

src/Symfony/Bridge/Doctrine/composer.json

@@ -43,7 +43,7 @@
         "symfony/translation": "^5.4|^6.0",
         "symfony/var-dumper": "^5.4|^6.0",
         "doctrine/annotations": "^1.10.4",
-        "doctrine/collections": "~1.0",
+        "doctrine/collections": "^1.0|^2.0",
         "doctrine/data-fixtures": "^1.1",
         "doctrine/dbal": "^2.13.1|^3.0",
         "doctrine/orm": "^2.7.4",

src/Symfony/Component/Form/composer.json

@@ -28,7 +28,7 @@
         "symfony/service-contracts": "^1.1|^2|^3"
     },
     "require-dev": {
-        "doctrine/collections": "~1.0",
+        "doctrine/collections": "^1.0|^2.0",
         "symfony/validator": "^5.4|^6.0",
         "symfony/dependency-injection": "^5.4|^6.0",
         "symfony/expression-language": "^5.4|^6.0",

src/Symfony/Component/Mime/Tests/Crypto/SMimeEncryptorTest.php renamed to src/Symfony/Component/Mime/Tests/Crypto/SMimeEncrypterTest.php

@@ -19,7 +19,7 @@
 /**
  * @requires extension openssl
  */
-class SMimeEncryptorTest extends SMimeTestCase
+class SMimeEncrypterTest extends SMimeTestCase
 {
     public function testEncryptMessage()
     {