Fix tests

Author: wouterj

src/Security/UserClassBuilder.php

@@ -98,22 +98,9 @@ private function addGetUsername(ClassSourceManipulator $manipulator, UserClassCo
             );
         }
 
-        $getterIdentifierName = 'getUsername';
-
         // Check if we're using Symfony 5.3+ - UserInterface::getUsername() was replaced with UserInterface::getUserIdentifier()
-        if (class_exists(InMemoryUser::class)) {
-            $getterIdentifierName = 'getUserIdentifier';
-
-            // also add the deprecated getUsername method
-            $manipulator->addAccessorMethod(
-                $userClassConfig->getIdentityPropertyName(),
-                'getUsername',
-                'string',
-                false,
-                ['@deprecated since Symfony 5.3, use getUserIdentifier instead'],
-                true
-            );
-        }
+        $symfony53GTE = class_exists(InMemoryUser::class);
+        $getterIdentifierName = $symfony53GTE ? 'getUserIdentifier' : 'getUsername';
 
         // define getUsername (if it was defined above, this will override)
         $manipulator->addAccessorMethod(
@@ -128,6 +115,18 @@ private function addGetUsername(ClassSourceManipulator $manipulator, UserClassCo
             ],
             true
         );
+
+        if ($symfony53GTE) {
+            // also add the deprecated getUsername method
+            $manipulator->addAccessorMethod(
+                $userClassConfig->getIdentityPropertyName(),
+                'getUsername',
+                'string',
+                false,
+                ['@deprecated since Symfony 5.3, use getUserIdentifier instead'],
+                true
+            );
+        }
     }
 
     private function addGetRoles(ClassSourceManipulator $manipulator, UserClassConfiguration $userClassConfig)

tests/Security/fixtures/expected/UserEntityWithEmailAsIdentifier.php

@@ -61,6 +61,14 @@ public function getUserIdentifier(): string
         return (string) $this->email;
     }
 
+    /**
+     * @deprecated since Symfony 5.3, use getUserIdentifier instead
+     */
+    public function getUsername(): string
+    {
+        return (string) $this->email;
+    }
+
     /**
      * @see UserInterface
      */

tests/Security/fixtures/expected/UserEntityWithPassword.php

@@ -56,6 +56,14 @@ public function setUserIdentifier(string $userIdentifier): self
         return $this;
     }
 
+    /**
+     * @deprecated since Symfony 5.3, use getUserIdentifier instead
+     */
+    public function getUsername(): string
+    {
+        return (string) $this->userIdentifier;
+    }
+
     /**
      * @see UserInterface
      */

tests/Security/fixtures/expected/UserEntityWithUser_IdentifierAsIdentifier.php

@@ -56,6 +56,14 @@ public function setUserIdentifier(string $user_identifier): self
         return $this;
     }
 
+    /**
+     * @deprecated since Symfony 5.3, use getUserIdentifier instead
+     */
+    public function getUsername(): string
+    {
+        return (string) $this->user_identifier;
+    }
+
     /**
      * @see UserInterface
      */

tests/Security/fixtures/expected/UserEntityWithoutPassword.php

@@ -50,6 +50,14 @@ public function setUserIdentifier(string $userIdentifier): self
         return $this;
     }
 
+    /**
+     * @deprecated since Symfony 5.3, use getUserIdentifier instead
+     */
+    public function getUsername(): string
+    {
+        return (string) $this->userIdentifier;
+    }
+
     /**
      * @see UserInterface
      */

tests/Security/fixtures/expected/UserModelWithEmailAsIdentifier.php

@@ -38,6 +38,14 @@ public function getUserIdentifier(): string
         return (string) $this->email;
     }
 
+    /**
+     * @deprecated since Symfony 5.3, use getUserIdentifier instead
+     */
+    public function getUsername(): string
+    {
+        return (string) $this->email;
+    }
+
     /**
      * @see UserInterface
      */

tests/Security/fixtures/expected/UserModelWithPassword.php

@@ -33,6 +33,14 @@ public function setUserIdentifier(string $userIdentifier): self
         return $this;
     }
 
+    /**
+     * @deprecated since Symfony 5.3, use getUserIdentifier instead
+     */
+    public function getUsername(): string
+    {
+        return (string) $this->userIdentifier;
+    }
+
     /**
      * @see UserInterface
      */

tests/Security/fixtures/expected/UserModelWithoutPassword.php

@@ -28,6 +28,14 @@ public function setUserIdentifier(string $userIdentifier): self
         return $this;
     }
 
+    /**
+     * @deprecated since Symfony 5.3, use getUserIdentifier instead
+     */
+    public function getUsername(): string
+    {
+        return (string) $this->userIdentifier;
+    }
+
     /**
      * @see UserInterface
      */