Merge remote branch 'origin/1.3.x'

Author: XWB

Model/User.php

@@ -149,7 +149,8 @@ public function addRole($role)
     /**
      * Serializes the user.
      *
-     * The serialized data have to contain the fields used by the equals method and the username.
+     * The serialized data have to contain the fields used during check for
+     * changes and the id.
      *
      * @return string
      */
@@ -165,6 +166,10 @@ public function serialize()
             $this->credentialsExpired,
             $this->enabled,
             $this->id,
+            $this->expiresAt,
+            $this->credentialsExpireAt,
+            $this->email,
+            $this->emailCanonical,
         ));
     }
 
@@ -189,7 +194,11 @@ public function unserialize($serialized)
             $this->locked,
             $this->credentialsExpired,
             $this->enabled,
-            $this->id
+            $this->id,
+            $this->expiresAt,
+            $this->credentialsExpireAt,
+            $this->email,
+            $this->emailCanonical
         ) = $data;
     }
 

Resources/doc/index.rst

@@ -118,6 +118,7 @@ start:
 
     .. code-block:: php-annotations
 
+        <?php
         // src/AppBundle/Entity/User.php
 
         namespace AppBundle\Entity;
@@ -174,7 +175,7 @@ start:
 
 .. caution::
 
-    ``user`` is a reserved keyword in SQL so you cannot use it as table name.
+    ``user`` is a reserved keyword in the SQL standard. If you need to use reserved words, surround them with backticks, *e.g.* ``@ORM\Table(name="`user`")``
 
 b) MongoDB User class
 .....................

Resources/translations/FOSUserBundle.pl.yml

@@ -66,7 +66,7 @@ resetting:
     flash:
         success: Hasło zostało zresetowane
     email:
-        subject: Witaj %username%!
+        subject: Resetowanie hasła
         message: |
             Cześć %username%!