Merge branch '5.4' into 6.4

* 5.4:
  [Messenger] Fix reading pending messages with Redis
  [Serializer] Revert symfony#54488 to fix BC Break
  [Validator] reviewed Polish translation for unit 113
  [Validator] Missing translations for Croatian (hr)
  review and fix hungarian validation message
  Update translation
  review uk translations v2
  [Validator] Update message translations for unit 113 (TLD)
  [Intl] Remove resources data from classmap generation

Author: nicolas-grekas

src/Symfony/Component/Intl/composer.json

@@ -34,7 +34,8 @@
     "autoload": {
         "psr-4": { "Symfony\\Component\\Intl\\": "" },
         "exclude-from-classmap": [
-            "/Tests/"
+            "/Tests/",
+            "/Resources/data/"
         ]
     },
     "minimum-stability": "dev"

src/Symfony/Component/Messenger/Bridge/Redis/Transport/Connection.php

@@ -330,7 +330,7 @@ private function claimOldPendingMessages(): void
         try {
             // This could soon be optimized with https://github.com/antirez/redis/issues/5212 or
             // https://github.com/antirez/redis/issues/6256
-            $pendingMessages = $this->getRedis()->xpending($this->stream, $this->group, '-', '+', 1);
+            $pendingMessages = $this->getRedis()->xpending($this->stream, $this->group, '-', '+', 1) ?: [];
         } catch (\RedisException|\Relay\Exception $e) {
             throw new TransportException($e->getMessage(), 0, $e);
         }

src/Symfony/Component/Serializer/Mapping/Loader/AttributeLoader.php

@@ -130,7 +130,7 @@ public function loadClassMetadata(ClassMetadataInterface $classMetadata): bool
 
             $accessorOrMutator = preg_match('/^(get|is|has|set)(.+)$/i', $method->name, $matches);
             if ($accessorOrMutator) {
-                $attributeName = $reflectionClass->hasProperty($method->name) ? $method->name : lcfirst($matches[2]);
+                $attributeName = lcfirst($matches[2]);
 
                 if (isset($attributesMetadata[$attributeName])) {
                     $attributeMetadata = $attributesMetadata[$attributeName];

src/Symfony/Component/Serializer/Normalizer/ObjectNormalizer.php

@@ -98,25 +98,17 @@ protected function extractAttributes(object $object, ?string $format = null, arr
 
             if (str_starts_with($name, 'get') || str_starts_with($name, 'has') || str_starts_with($name, 'can')) {
                 // getters, hassers and canners
-                $attributeName = $name;
+                $attributeName = substr($name, 3);
 
                 if (!$reflClass->hasProperty($attributeName)) {
-                    $attributeName = substr($attributeName, 3);
-
-                    if (!$reflClass->hasProperty($attributeName)) {
-                        $attributeName = lcfirst($attributeName);
-                    }
+                    $attributeName = lcfirst($attributeName);
                 }
             } elseif (str_starts_with($name, 'is')) {
                 // issers
-                $attributeName = $name;
+                $attributeName = substr($name, 2);
 
                 if (!$reflClass->hasProperty($attributeName)) {
-                    $attributeName = substr($attributeName, 2);
-
-                    if (!$reflClass->hasProperty($attributeName)) {
-                        $attributeName = lcfirst($attributeName);
-                    }
+                    $attributeName = lcfirst($attributeName);
                 }
             }
 

src/Symfony/Component/Serializer/Tests/Fixtures/SamePropertyAsMethodDummy.php

@@ -43,9 +43,6 @@
 use Symfony\Component\Serializer\Tests\Fixtures\Php74Dummy;
 use Symfony\Component\Serializer\Tests\Fixtures\Php74DummyPrivate;
 use Symfony\Component\Serializer\Tests\Fixtures\Php80Dummy;
-use Symfony\Component\Serializer\Tests\Fixtures\SamePropertyAsMethodDummy;
-use Symfony\Component\Serializer\Tests\Fixtures\SamePropertyAsMethodWithMethodSerializedNameDummy;
-use Symfony\Component\Serializer\Tests\Fixtures\SamePropertyAsMethodWithPropertySerializedNameDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\SiblingHolder;
 use Symfony\Component\Serializer\Tests\Normalizer\Features\AttributesTestTrait;
 use Symfony\Component\Serializer\Tests\Normalizer\Features\CacheableObjectAttributesTestTrait;
@@ -855,53 +852,6 @@ public function testNormalizeStdClass()
         $this->assertSame(['baz' => 'baz'], $this->normalizer->normalize($o2));
     }
 
-    public function testSamePropertyAsMethod()
-    {
-        $object = new SamePropertyAsMethodDummy('free_trial', 'has_subscribe', 'get_ready', 'is_active');
-        $expected = [
-            'freeTrial' => 'free_trial',
-            'hasSubscribe' => 'has_subscribe',
-            'getReady' => 'get_ready',
-            'isActive' => 'is_active',
-        ];
-
-        $this->assertSame($expected, $this->normalizer->normalize($object));
-    }
-
-    public function testSamePropertyAsMethodWithPropertySerializedName()
-    {
-        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
-        $this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
-        $this->normalizer->setSerializer($this->serializer);
-
-        $object = new SamePropertyAsMethodWithPropertySerializedNameDummy('free_trial', 'has_subscribe', 'get_ready', 'is_active');
-        $expected = [
-            'free_trial_property' => 'free_trial',
-            'has_subscribe_property' => 'has_subscribe',
-            'get_ready_property' => 'get_ready',
-            'is_active_property' => 'is_active',
-        ];
-
-        $this->assertSame($expected, $this->normalizer->normalize($object));
-    }
-
-    public function testSamePropertyAsMethodWithMethodSerializedName()
-    {
-        $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());
-        $this->normalizer = new ObjectNormalizer($classMetadataFactory, new MetadataAwareNameConverter($classMetadataFactory));
-        $this->normalizer->setSerializer($this->serializer);
-
-        $object = new SamePropertyAsMethodWithMethodSerializedNameDummy('free_trial', 'has_subscribe', 'get_ready', 'is_active');
-        $expected = [
-            'free_trial_method' => 'free_trial',
-            'has_subscribe_method' => 'has_subscribe',
-            'get_ready_method' => 'get_ready',
-            'is_active_method' => 'is_active',
-        ];
-
-        $this->assertSame($expected, $this->normalizer->normalize($object));
-    }
-
     public function testNormalizeWithIgnoreAttributeAndPrivateProperties()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AttributeLoader());

src/Symfony/Component/Serializer/Tests/Fixtures/SamePropertyAsMethodWithMethodSerializedNameDummy.php

@@ -439,8 +439,8 @@
                 <target state="needs-review-translation">Hierdie waarde is nie 'n geldige MAC-adres nie.</target>
             </trans-unit>
             <trans-unit id="113">
-                <source>This URL does not contain a TLD.</source>
-                <target state="needs-review-translation">Hierdie URL bevat nie 'n topvlakdomein (TLD) nie.</target>
+                <source>This URL is missing a top-level domain.</source>
+                <target state="needs-review-translation">Die URL mis 'n topvlakdomein.</target>
             </trans-unit>
         </body>
     </file>

src/Symfony/Component/Serializer/Tests/Fixtures/SamePropertyAsMethodWithPropertySerializedNameDummy.php

@@ -439,8 +439,8 @@
                 <target>هذه القيمة ليست عنوان MAC صالحًا.</target>
             </trans-unit>
             <trans-unit id="113">
-                <source>This URL does not contain a TLD.</source>
-                <target state="needs-review-translation">هذا الرابط لا يحتوي على نطاق أعلى مستوى (TLD).</target>
+                <source>This URL is missing a top-level domain.</source>
+                <target state="needs-review-translation">هذا الرابط يفتقر إلى نطاق أعلى مستوى.</target>
             </trans-unit>
         </body>
     </file>