Merge branch '5.4' into 6.3

nicolas-grekas · nicolas-grekas · commit 668c44132180 · 2023-11-28T21:40:29.000+01:00
* 5.4: [Serializer] Fix normalization relying on allowed attributes only [Validator] Add missing translations for Bulgarian symfony#51931 [String] Fix Inflector for 'icon'
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -269,7 +269,7 @@ protected function getAttributes(object $object, ?string $format, array $context
         $allowedAttributes = $this->getAllowedAttributes($object, $context, true);
 
         if (false !== $allowedAttributes) {
-            $attributes = array_intersect($attributes, $allowedAttributes);
+            $attributes = $attributes ? array_intersect($attributes, $allowedAttributes) : $allowedAttributes;
         }
 
         if ($context['cache_key'] && \stdClass::class !== $class) {
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -847,9 +847,39 @@ public function testDenormalizeWithCorrectOrderOfAttributeAndProperty()
     public function testNormalizeWithIgnoreAnnotationAndPrivateProperties()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));
-        $serializer = new Serializer([new ObjectNormalizer($classMetadataFactory)]);
+        $normalizer = new ObjectNormalizer($classMetadataFactory);
 
-        $this->assertSame(['foo' => 'foo'], $serializer->normalize(new ObjectDummyWithIgnoreAnnotationAndPrivateProperty()));
+        $this->assertSame(['foo' => 'foo'], $normalizer->normalize(new ObjectDummyWithIgnoreAnnotationAndPrivateProperty()));
+    }
+
+    public function testNormalizeBasedOnAllowedAttributes()
+    {
+        $normalizer = new class() extends AbstractObjectNormalizer {
+            protected function getAllowedAttributes($classOrObject, array $context, bool $attributesAsString = false)
+            {
+                return ['foo'];
+            }
+
+            protected function extractAttributes(object $object, string $format = null, array $context = []): array
+            {
+                return [];
+            }
+
+            protected function getAttributeValue(object $object, string $attribute, string $format = null, array $context = [])
+            {
+                return $object->$attribute;
+            }
+
+            protected function setAttributeValue(object $object, string $attribute, $value, string $format = null, array $context = [])
+            {
+            }
+        };
+
+        $object = new Dummy();
+        $object->foo = 'foo';
+        $object->bar = 'bar';
+
+        $this->assertSame(['foo' => 'foo'], $normalizer->normalize($object));
     }
 
     public function testDenormalizeUntypedFormat()
diff --git a/src/Symfony/Component/String/Inflector/EnglishInflector.php b/src/Symfony/Component/String/Inflector/EnglishInflector.php
@@ -253,6 +253,9 @@ final class EnglishInflector implements InflectorInterface
         // seasons (season), treasons (treason), poisons (poison), lessons (lesson)
         ['nos', 3, true, true, 'sons'],
 
+        // icons (icon)
+        ['noc', 3, true, true, 'cons'],
+
         // bacteria (bacterium), criteria (criterion), phenomena (phenomenon)
         ['no', 2, true, true, 'a'],
 
diff --git a/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php b/src/Symfony/Component/String/Tests/Inflector/EnglishInflectorTest.php
@@ -295,6 +295,7 @@ public static function pluralizeProvider()
             ['tree', 'trees'],
             ['waltz', 'waltzes'],
             ['wife', 'wives'],
+            ['icon', 'icons'],
 
             // test casing: if the first letter was uppercase, it should remain so
             ['Man', 'Men'],
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf
@@ -402,6 +402,30 @@
                 <source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
                 <target>Стойността на мрежовата маска трябва да бъде между {{ min }} и {{ max }}.</target>
             </trans-unit>
+            <trans-unit id="104">
+                <source>The filename is too long. It should have {{ filename_max_length }} character or less.|The filename is too long. It should have {{ filename_max_length }} characters or less.</source>
+                <target>Името на файла е твърде дълго. Трябва да съдържа не повече от {{ filename_max_length }} символ.|Името на файла е твърде дълго. Трябва да съдържа не повече от {{ filename_max_length }} символа.</target>
+            </trans-unit>
+            <trans-unit id="105">
+                <source>The password strength is too low. Please use a stronger password.</source>
+                <target>Сложността на паролата е твърде малка. Моля използвайте по-сложна парола.</target>
+            </trans-unit>
+            <trans-unit id="106">
+                <source>This value contains characters that are not allowed by the current restriction-level.</source>
+                <target>Стойността съдържа символи, които не са позволени от текущото ниво на ограничение.</target>
+            </trans-unit>
+            <trans-unit id="107">
+                <source>Using invisible characters is not allowed.</source>
+                <target>Използването на невидими символи не е позволено.</target>
+            </trans-unit>
+            <trans-unit id="108">
+                <source>Mixing numbers from different scripts is not allowed.</source>
+                <target>Смесването на числа от различни скриптове не е позволено.</target>
+            </trans-unit>
+            <trans-unit id="109">
+                <source>Using hidden overlay characters is not allowed.</source>
+                <target>Използването на скрити насложени символи не е позволено.</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>

Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ protected function getAttributes(object $object, ?string $format, array $context`
`269`	`269`	`$allowedAttributes = $this->getAllowedAttributes($object, $context, true);`
`270`	`270`
`271`	`271`	`if (false !== $allowedAttributes) {`
`272`		`- $attributes = array_intersect($attributes, $allowedAttributes);`
	`272`	`+ $attributes = $attributes ? array_intersect($attributes, $allowedAttributes) : $allowedAttributes;`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`if ($context['cache_key'] && \stdClass::class !== $class) {`