Implement PasswordAuthenticatedUserInterface when appropriate

Author: stof

Model/User.php

@@ -199,6 +199,11 @@ public function getId()
         return $this->id;
     }
 
+    public function getUserIdentifier(): string
+    {
+        return $this->username;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -242,7 +247,7 @@ public function getEmailCanonical()
     /**
      * {@inheritdoc}
      */
-    public function getPassword()
+    public function getPassword(): ?string
     {
         return $this->password;
     }

Model/UserInterface.php

@@ -11,8 +11,25 @@
 
 namespace FOS\UserBundle\Model;
 
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\UserInterface as BaseUserInterface;
 
+if (interface_exists(PasswordAuthenticatedUserInterface::class)) {
+    /**
+     * @internal Only for back compatibility. Remove / merge when dropping support for Symfony 4
+     */
+    interface CompatUserInterface extends PasswordAuthenticatedUserInterface, BaseUserInterface
+    {
+    }
+} else {
+    /**
+     * @internal Only for back compatibility. Remove / merge when dropping support for Symfony 4
+     */
+    interface CompatUserInterface extends BaseUserInterface
+    {
+    }
+}
+
 /**
  * Implementations of that interface must be serializable. The mechanism
  * being used to support serialization is up for the implementation.
@@ -23,7 +40,7 @@
  * @author Johannes M. Schmitt <schmittjoh@gmail.com>
  * @author Julian Finkler <julian@developer-heaven.de>
  */
-interface UserInterface extends BaseUserInterface
+interface UserInterface extends CompatUserInterface
 {
     public const ROLE_DEFAULT = 'ROLE_USER';