Merge pull request #957 from scribblet/master

Modify user variables to be nullable when expecting a DateTime

Author: stof

Changelog.md

@@ -6,6 +6,8 @@ Changelog
 * Removed the deprecated UserManager and GroupManager classes for the different Doctrine implementations
 * [BC break] Refactored the structure of controller to dispatch events instead of using form handlers
 * Removed all form handlers
+* [BC break] Changed Datetime properties of default User entity that were nullable to default to null when no value supplied
+* [BC break] Updated schema.xml for Propel BaseUser class to allow nullable and typehint accordingly
 
 ### 1.3.1 (2012-12-22)
 

Model/User.php

@@ -392,7 +392,7 @@ public function setUsernameCanonical($usernameCanonical)
      *
      * @return User
      */
-    public function setCredentialsExpireAt(\DateTime $date)
+    public function setCredentialsExpireAt(\DateTime $date = null)
     {
         $this->credentialsExpireAt = $date;
 
@@ -451,7 +451,7 @@ public function setExpired($boolean)
      *
      * @return User
      */
-    public function setExpiresAt(\DateTime $date)
+    public function setExpiresAt(\DateTime $date = null)
     {
         $this->expiresAt = $date;
 
@@ -483,7 +483,7 @@ public function setPlainPassword($password)
         return $this;
     }
 
-    public function setLastLogin(\DateTime $time)
+    public function setLastLogin(\DateTime $time = null)
     {
         $this->lastLogin = $time;
 

Model/UserInterface.php

@@ -188,7 +188,7 @@ public function isPasswordRequestNonExpired($ttl);
      *
      * @return self
      */
-    public function setLastLogin(\DateTime $time);
+    public function setLastLogin(\DateTime $time = null);
 
     /**
      * Never use this to check if this user has access to anything!

Resources/config/propel/schema.xml

@@ -34,7 +34,7 @@
             <parameter name="roles" value="array" />
             <parameter name="fos_group" value="FOS\UserBundle\Model\GroupInterface" />
 
-            <parameter name="nullable_columns" value="password_requested_at" />
+            <parameter name="nullable_columns" value="password_requested_at, expires_at, last_login, credentials_expire_at" />
         </behavior>
     </table>