Skip to content

Commit 4b24dca

Browse files
Merge branch '5.4' into 6.3
* 5.4: [Mime] Fix serializing uninitialized RawMessage::$message to null [Notifer][Smsapi] Set messageId of SentMessage [DX] Use Symfony "dark-mode"-responsive logo in README support lazy evaluated exception messages with Xdebug 3
2 parents 2ae9f62 + ee94d9b commit 4b24dca

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

RawMessage.php

+3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
*/
1919
class RawMessage
2020
{
21+
/**
22+
* @var iterable|string
23+
*/
2124
private $message;
2225

2326
public function __construct(iterable|string $message)

Tests/EmailTest.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,7 @@ public function testSymfonySerialize()
564564
}
565565
]
566566
},
567-
"body": null,
568-
"message": null
567+
"body": null
569568
}
570569
EOF;
571570

Tests/MessageTest.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,7 @@ public function testSymfonySerialize()
254254
]
255255
},
256256
"class": "Symfony\\\\Component\\\\Mime\\\\Part\\\\Multipart\\\\MixedPart"
257-
},
258-
"message": null
257+
}
259258
}
260259
EOF;
261260

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
"symfony/dependency-injection": "^5.4|^6.0",
2929
"symfony/property-access": "^5.4|^6.0",
3030
"symfony/property-info": "^5.4|^6.0",
31-
"symfony/serializer": "~6.2.13|^6.3.2"
31+
"symfony/serializer": "~6.3.12|^6.4.3"
3232
},
3333
"conflict": {
3434
"egulias/email-validator": "~3.0.0",
3535
"phpdocumentor/reflection-docblock": "<3.2.2",
3636
"phpdocumentor/type-resolver": "<1.4.0",
3737
"symfony/mailer": "<5.4",
38-
"symfony/serializer": "<6.2.13|>=6.3,<6.3.2"
38+
"symfony/serializer": "<6.3.12|>=6.4,<6.4.3"
3939
},
4040
"autoload": {
4141
"psr-4": { "Symfony\\Component\\Mime\\": "" },

0 commit comments

Comments
 (0)