Merge branch '2.0.x'

Author: XWB

Model/User.php

@@ -74,24 +74,24 @@ abstract class User implements UserInterface, GroupableInterface
     protected $plainPassword;
 
     /**
-     * @var \DateTime
+     * @var \DateTime|null
      */
     protected $lastLogin;
 
     /**
      * Random string sent to the user email address in order to verify it.
      *
-     * @var string
+     * @var string|null
      */
     protected $confirmationToken;
 
     /**
-     * @var \DateTime
+     * @var \DateTime|null
      */
     protected $passwordRequestedAt;
 
     /**
-     * @var Collection
+     * @var GroupInterface[]|Collection
      */
     protected $groups;
 
@@ -255,7 +255,7 @@ public function getPlainPassword()
     /**
      * Gets the last login time.
      *
-     * @return \DateTime
+     * @return \DateTime|null
      */
     public function getLastLogin()
     {

Model/UserInterface.php

@@ -57,6 +57,8 @@ public function setUsernameCanonical($usernameCanonical);
 
     /**
      * @param string|null $salt
+     *
+     * @return static
      */
     public function setSalt($salt);
 
@@ -143,14 +145,14 @@ public function setSuperAdmin($boolean);
     /**
      * Gets the confirmation token.
      *
-     * @return string
+     * @return string|null
      */
     public function getConfirmationToken();
 
     /**
      * Sets the confirmation token.
      *
-     * @param string $confirmationToken
+     * @param string|null $confirmationToken
      *
      * @return static
      */
@@ -177,7 +179,7 @@ public function isPasswordRequestNonExpired($ttl);
     /**
      * Sets the last login time.
      *
-     * @param \DateTime $time
+     * @param \DateTime|null $time
      *
      * @return static
      */