Merge branch '6.4' into 7.3

* 6.4:
  [Cache] Fix DSN auth not passed to clusters in RedisTrait
  do not parse "scalar" as an object
  [Form] Fix OrderedHashMap auto-increment logic with mixed keys
  don't skip custom view transformers while normalizing submitted newlines
  [Serializer] Fix is/has/can accessor naming regression while preserving collision detection

Author: nicolas-grekas

Extension/Core/EventListener/CrlfNormalizerListener.php

@@ -12,16 +12,17 @@
 namespace Symfony\Component\Form\Extension\Core\Type;
 
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\EventListener\CrlfNormalizerListener;
+use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
+use Symfony\Component\Form\Util\StringUtil;
 
-class TextareaType extends AbstractType
+class TextareaType extends AbstractType implements DataTransformerInterface
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $builder->addEventSubscriber(new CrlfNormalizerListener());
+        $builder->addViewTransformer($this);
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options): void
@@ -39,4 +40,26 @@ public function getBlockPrefix(): string
     {
         return 'textarea';
     }
+
+    public function transform(mixed $value): mixed
+    {
+        if (null === $value) {
+            return '';
+        }
+
+        return $value;
+    }
+
+    public function reverseTransform(mixed $value): mixed
+    {
+        if (!\is_string($value)) {
+            return $value;
+        }
+
+        if ('' === $value) {
+            return null;
+        }
+
+        return StringUtil::normalizeNewlines($value);
+    }
 }

Extension/Core/Type/TextareaType.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Form\Tests\Extension\Core\Type;
 
+use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 
 class TextareaTypeTest extends BaseTypeTestCase
@@ -86,4 +87,33 @@ public function testWithTrimEnabled()
 
         $this->assertSame("Line 1\nLine 2", $form->getData());
     }
+
+    public function testCustomViewTransformerTakesPrecedence()
+    {
+        $form = $this->factory->createBuilder(static::TESTED_TYPE)
+            ->addViewTransformer(new CallbackTransformer(
+                static function (?string $value) {
+                    if (null === $value) {
+                        return null;
+                    }
+
+                    return str_replace(';', "\r\n", $value);
+                },
+                static function (?string $value) {
+                    if (null === $value) {
+                        return null;
+                    }
+
+                    return str_replace("\r\n", ';', $value);
+                }
+            ))
+            ->getForm();
+        $form->setData('foo;bar');
+
+        $this->assertSame("foo\r\nbar", $form->getViewData());
+
+        $form->submit("bar\r\nbaz");
+
+        $this->assertSame('bar;baz', $form->getData());
+    }
 }

Tests/Extension/Core/EventListener/CrlfNormalizerListenerTest.php

@@ -524,4 +524,36 @@ public function testCount()
 
         $this->assertCount(2, $map);
     }
+
+    public function testAppendDoesNotOverwriteExistingNumericKeysWhenStringKeysExist()
+    {
+        $map = new OrderedHashMap();
+        $map[0] = 'zero';
+        $map[1] = 'one';
+        $map['foo'] = 'bar';
+        $map[] = 'new';
+
+        $this->assertSame('one', $map[1]);
+        $this->assertSame('new', $map[2]);
+    }
+
+    public function testUpdateNullValueDoesNotChangeElementPosition()
+    {
+        $map = new OrderedHashMap();
+        $map['first'] = null;
+        $map['second'] = 2;
+        $map['first'] = null;
+
+        $this->assertSame(['first' => null, 'second' => 2], iterator_to_array($map));
+    }
+
+    public function testUpdateFromNullValueDoesNotChangeElementPosition()
+    {
+        $map = new OrderedHashMap();
+        $map['first'] = null;
+        $map['second'] = 2;
+        $map['first'] = 1;
+
+        $this->assertSame(['first' => 1, 'second' => 2], iterator_to_array($map));
+    }
 }

Tests/Extension/Core/Type/TextareaTypeTest.php

@@ -113,16 +113,11 @@ public function offsetGet(mixed $key): mixed
 
     public function offsetSet(mixed $key, mixed $value): void
     {
-        if (null === $key || !isset($this->elements[$key])) {
-            if (null === $key) {
-                $key = [] === $this->orderedKeys
-                    // If the array is empty, use 0 as key
-                    ? 0
-                    // Imitate PHP behavior of generating a key that equals
-                    // the highest existing integer key + 1
-                    : 1 + (int) max($this->orderedKeys);
-            }
-
+        if (null === $key) {
+            $this->elements[] = $value;
+            $key = array_key_last($this->elements);
+            $this->orderedKeys[] = (string) $key;
+        } elseif (!\array_key_exists($key, $this->elements)) {
             $this->orderedKeys[] = (string) $key;
         }