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 67f43b0

Browse filesBrowse files
xabbuhxabbuh
committed
Merge branch '4.4' into 5.3
* 4.4: Added missing danish translation string Add Hungarian translation of new string improve greek translations [Messenger] fix: TypeError in PhpSerializer::encode() [Config] Fix files sorting in GlobResource Minor doc block wording change
2 parents 6fad569 + b2f537d commit 67f43b0
Copy full SHA for 67f43b0

File tree

8 files changed

+32
-4
lines changed
Filter options

8 files changed

+32
-4
lines changed

‎src/Symfony/Component/Config/Resource/GlobResource.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/Resource/GlobResource.php
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function getIterator(): \Traversable
119119
}
120120

121121
if (null !== $paths) {
122-
sort($paths);
122+
natsort($paths);
123123
foreach ($paths as $path) {
124124
if ($this->excludedPrefixes) {
125125
$normalizedPath = str_replace('\\', '/', $path);
@@ -152,7 +152,7 @@ function (\SplFileInfo $file, $path) {
152152
),
153153
\RecursiveIteratorIterator::LEAVES_ONLY
154154
));
155-
uasort($files, 'strnatcmp');
155+
uksort($files, 'strnatcmp');
156156

157157
foreach ($files as $path => $info) {
158158
if ($info->isFile()) {

‎src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,18 @@ public function testDecodingFailsWithBadFormat()
5353
]);
5454
}
5555

56+
public function testDecodingFailsWithBadBase64Body()
57+
{
58+
$this->expectException(MessageDecodingFailedException::class);
59+
$this->expectExceptionMessageMatches('/Could not decode/');
60+
61+
$serializer = new PhpSerializer();
62+
63+
$serializer->decode([
64+
'body' => 'x',
65+
]);
66+
}
67+
5668
public function testDecodingFailsWithBadClass()
5769
{
5870
$this->expectException(MessageDecodingFailedException::class);

‎src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ public function encode(Envelope $envelope): array
5858

5959
private function safelyUnserialize(string $contents)
6060
{
61+
if ('' === $contents) {
62+
throw new MessageDecodingFailedException('Could not decode an empty message using PHP serialization.');
63+
}
64+
6165
$signalingException = new MessageDecodingFailedException(sprintf('Could not decode message using PHP serialization: %s.', $contents));
6266
$prevUnserializeHandler = ini_set('unserialize_callback_func', self::class.'::handleUnserializeCallback');
6367
$prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler, $signalingException) {

‎src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
</trans-unit>
4545
<trans-unit id="12">
4646
<source>Username could not be found.</source>
47-
<target>Το Username δε βρέθηκε.</target>
47+
<target>Το όνομα χρήστη δε βρέθηκε.</target>
4848
</trans-unit>
4949
<trans-unit id="13">
5050
<source>Account has expired.</source>

‎src/Symfony/Component/Security/Core/User/UserInterface.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/User/UserInterface.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ interface UserInterface
4040
* return ['ROLE_USER'];
4141
* }
4242
*
43-
* Alternatively, the roles might be stored on a ``roles`` property,
43+
* Alternatively, the roles might be stored in a ``roles`` property,
4444
* and populated in any number of different ways when the user object
4545
* is created.
4646
*

‎src/Symfony/Component/Validator/Resources/translations/validators.da.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.da.xlf
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>Værdien skal være et gyldigt udtryk.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>Værdien skal være en gyldig CSS farve.</target>
396+
</trans-unit>
393397
</body>
394398
</file>
395399
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.el.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.el.xlf
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>Αυτή η τιμή πρέπει να είναι έγκυρη έκφραση.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>Αυτή η τιμή δεν είναι έγκυρο χρώμα CSS.</target>
396+
</trans-unit>
393397
</body>
394398
</file>
395399
</xliff>

‎src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>Ennek az értéknek érvényes kifejezésnek kell lennie.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>Ez az érték nem egy érvényes CSS szín.</target>
396+
</trans-unit>
393397
</body>
394398
</file>
395399
</xliff>

0 commit comments

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