From 97f6a1b4d9418b07f65f99873630694fb68e0c01 Mon Sep 17 00:00:00 2001
From: Eric GELOEN <geloen.eric@gmail.com>
Date: Tue, 13 Nov 2012 19:41:37 +0100
Subject: [PATCH] [Form] Update password type trimming to false

---
 UPGRADE-2.2.md                                           | 4 ++++
 .../Component/Form/Extension/Core/Type/PasswordType.php  | 1 +
 .../Form/Tests/Extension/Core/Type/PasswordTypeTest.php  | 9 +++++++++
 3 files changed, 14 insertions(+)

diff --git a/UPGRADE-2.2.md b/UPGRADE-2.2.md
index 320339db30..dc1f49326f 100644
--- a/UPGRADE-2.2.md
+++ b/UPGRADE-2.2.md
@@ -31,3 +31,7 @@
    $accepts = AcceptHeader::fromString($request->headers->get('Accept'))->all();
 
    ```
+
+### Form
+
+  * The PasswordType is now not trimmed by default.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php b/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
index 14ece2ac50..d76281e567 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/PasswordType.php
@@ -35,6 +35,7 @@ class PasswordType extends AbstractType
     {
         $resolver->setDefaults(array(
             'always_empty' => true,
+            'trim'         => false,
         ));
     }
 
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
index 96f1410968..fdfd0083eb 100644
--- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
+++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/PasswordTypeTest.php
@@ -39,4 +39,13 @@ class PasswordTypeTest extends TypeTestCase
 
         $this->assertSame('pAs5w0rd', $view->vars['value']);
     }
+
+    public function testNotTrimmed()
+    {
+        $form = $this->factory->create('password', null);
+        $form->bind(' pAs5w0rd ');
+        $data = $form->getData();
+
+        $this->assertSame(' pAs5w0rd ', $data);
+    }
 }