Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 3b90a91

Browse filesBrowse files
Merge branch '5.4' into 6.0
* 5.4: [Mime] Rename SMimeEncryptorTest to SMimeEncrypterTest Run tests with doctrine/collections 2
2 parents febf5e9 + f67ff76 commit 3b90a91
Copy full SHA for 3b90a91

File tree

Expand file treeCollapse file tree

4 files changed

+4
-4
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+4
-4
lines changed

‎composer.json

Copy file name to clipboardExpand all lines: composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
"async-aws/sns": "^1.0",
123123
"cache/integration-tests": "dev-master",
124124
"doctrine/annotations": "^1.13.1",
125-
"doctrine/collections": "~1.0",
125+
"doctrine/collections": "^1.0|^2.0",
126126
"doctrine/data-fixtures": "^1.1",
127127
"doctrine/dbal": "^2.13.1|^3.0",
128128
"doctrine/orm": "^2.7.4",

‎src/Symfony/Bridge/Doctrine/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"symfony/translation": "^5.4|^6.0",
4444
"symfony/var-dumper": "^5.4|^6.0",
4545
"doctrine/annotations": "^1.10.4",
46-
"doctrine/collections": "~1.0",
46+
"doctrine/collections": "^1.0|^2.0",
4747
"doctrine/data-fixtures": "^1.1",
4848
"doctrine/dbal": "^2.13.1|^3.0",
4949
"doctrine/orm": "^2.7.4",

‎src/Symfony/Component/Form/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"symfony/service-contracts": "^1.1|^2|^3"
2929
},
3030
"require-dev": {
31-
"doctrine/collections": "~1.0",
31+
"doctrine/collections": "^1.0|^2.0",
3232
"symfony/validator": "^5.4|^6.0",
3333
"symfony/dependency-injection": "^5.4|^6.0",
3434
"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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Mime/Tests/Crypto/SMimeEncrypterTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/**
2020
* @requires extension openssl
2121
*/
22-
class SMimeEncryptorTest extends SMimeTestCase
22+
class SMimeEncrypterTest extends SMimeTestCase
2323
{
2424
public function testEncryptMessage()
2525
{

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.