Merge branch '4.4' into 5.3

xabbuh · xabbuh · commit 67f43b09652d · 2021-10-22T11:06:52.000+02:00
* 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
diff --git a/src/Symfony/Component/Config/Resource/GlobResource.php b/src/Symfony/Component/Config/Resource/GlobResource.php
@@ -119,7 +119,7 @@ public function getIterator(): \Traversable
         }
 
         if (null !== $paths) {
-            sort($paths);
+            natsort($paths);
             foreach ($paths as $path) {
                 if ($this->excludedPrefixes) {
                     $normalizedPath = str_replace('\\', '/', $path);
@@ -152,7 +152,7 @@ function (\SplFileInfo $file, $path) {
                     ),
                     \RecursiveIteratorIterator::LEAVES_ONLY
                 ));
-                uasort($files, 'strnatcmp');
+                uksort($files, 'strnatcmp');
 
                 foreach ($files as $path => $info) {
                     if ($info->isFile()) {
diff --git a/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php b/src/Symfony/Component/Messenger/Tests/Transport/Serialization/PhpSerializerTest.php
@@ -53,6 +53,18 @@ public function testDecodingFailsWithBadFormat()
         ]);
     }
 
+    public function testDecodingFailsWithBadBase64Body()
+    {
+        $this->expectException(MessageDecodingFailedException::class);
+        $this->expectExceptionMessageMatches('/Could not decode/');
+
+        $serializer = new PhpSerializer();
+
+        $serializer->decode([
+            'body' => 'x',
+        ]);
+    }
+
     public function testDecodingFailsWithBadClass()
     {
         $this->expectException(MessageDecodingFailedException::class);
diff --git a/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php b/src/Symfony/Component/Messenger/Transport/Serialization/PhpSerializer.php
@@ -58,6 +58,10 @@ public function encode(Envelope $envelope): array
 
     private function safelyUnserialize(string $contents)
     {
+        if ('' === $contents) {
+            throw new MessageDecodingFailedException('Could not decode an empty message using PHP serialization.');
+        }
+
         $signalingException = new MessageDecodingFailedException(sprintf('Could not decode message using PHP serialization: %s.', $contents));
         $prevUnserializeHandler = ini_set('unserialize_callback_func', self::class.'::handleUnserializeCallback');
         $prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$prevErrorHandler, $signalingException) {
diff --git a/src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf b/src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf
@@ -44,7 +44,7 @@
             </trans-unit>
             <trans-unit id="12">
                 <source>Username could not be found.</source>
-                <target>Το Username δε βρέθηκε.</target>
+                <target>Το όνομα χρήστη δε βρέθηκε.</target>
             </trans-unit>
             <trans-unit id="13">
                 <source>Account has expired.</source>
diff --git a/src/Symfony/Component/Security/Core/User/UserInterface.php b/src/Symfony/Component/Security/Core/User/UserInterface.php
@@ -40,7 +40,7 @@ interface UserInterface
      *         return ['ROLE_USER'];
      *     }
      *
-     * Alternatively, the roles might be stored on a ``roles`` property,
+     * Alternatively, the roles might be stored in a ``roles`` property,
      * and populated in any number of different ways when the user object
      * is created.
      *
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.da.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.da.xlf
@@ -390,6 +390,10 @@
                 <source>This value should be a valid expression.</source>
                 <target>Værdien skal være et gyldigt udtryk.</target>
             </trans-unit>
+            <trans-unit id="101">
+                <source>This value is not a valid CSS color.</source>
+                <target>Værdien skal være en gyldig CSS farve.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.el.xlf
@@ -390,6 +390,10 @@
                 <source>This value should be a valid expression.</source>
                 <target>Αυτή η τιμή πρέπει να είναι έγκυρη έκφραση.</target>
             </trans-unit>
+            <trans-unit id="101">
+                <source>This value is not a valid CSS color.</source>
+                <target>Αυτή η τιμή δεν είναι έγκυρο χρώμα CSS.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.hu.xlf
@@ -390,6 +390,10 @@
                 <source>This value should be a valid expression.</source>
                 <target>Ennek az értéknek érvényes kifejezésnek kell lennie.</target>
             </trans-unit>
+            <trans-unit id="101">
+                <source>This value is not a valid CSS color.</source>
+                <target>Ez az érték nem egy érvényes CSS szín.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ interface UserInterface`
`40`	`40`	`* return ['ROLE_USER'];`
`41`	`41`	`* }`
`42`	`42`	`*`
`43`		- * Alternatively, the roles might be stored on a ``roles`` property,
	`43`	+ * Alternatively, the roles might be stored in a ``roles`` property,
`44`	`44`	`* and populated in any number of different ways when the user object`
`45`	`45`	`* is created.`
`46`	`46`	`*`