[make:user] add class name for UniqueConstraint

seb-jean · seb-jean · commit cdf75917eb5b · 2025-08-03T15:46:05.000+02:00
diff --git a/src/Maker/MakeUser.php b/src/Maker/MakeUser.php
@@ -162,7 +162,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
 
         $manipulator->setIo($io);
 
-        $this->userClassBuilder->addUserInterfaceImplementation($manipulator, $userClassConfiguration);
+        $this->userClassBuilder->addUserInterfaceImplementation($manipulator, $userClassConfiguration, $userClassNameDetails->getShortName());
 
         $generator->dumpFile($classPath, $manipulator->getSourceCode());
 
diff --git a/src/Security/UserClassBuilder.php b/src/Security/UserClassBuilder.php
@@ -26,11 +26,11 @@
  */
 final class UserClassBuilder
 {
-    public function addUserInterfaceImplementation(ClassSourceManipulator $manipulator, UserClassConfiguration $userClassConfig): void
+    public function addUserInterfaceImplementation(ClassSourceManipulator $manipulator, UserClassConfiguration $userClassConfig, string $className): void
     {
         $manipulator->addInterface(UserInterface::class);
 
-        $this->addUniqueConstraint($manipulator, $userClassConfig);
+        $this->addUniqueConstraint($manipulator, $userClassConfig, $className);
 
         $this->addGetUsername($manipulator, $userClassConfig);
 
@@ -332,7 +332,7 @@ private function addSerialize(ClassSourceManipulator $manipulator): void
         $manipulator->addMethodBuilder($builder);
     }
 
-    private function addUniqueConstraint(ClassSourceManipulator $manipulator, UserClassConfiguration $userClassConfig): void
+    private function addUniqueConstraint(ClassSourceManipulator $manipulator, UserClassConfiguration $userClassConfig, string $className): void
     {
         if (!$userClassConfig->isEntity()) {
             return;
@@ -341,7 +341,7 @@ private function addUniqueConstraint(ClassSourceManipulator $manipulator, UserCl
         $manipulator->addAttributeToClass(
             'ORM\\UniqueConstraint',
             [
-                'name' => 'UNIQ_IDENTIFIER_'.strtoupper(Str::asSnakeCase($userClassConfig->getIdentityPropertyName())),
+                'name' => strtoupper(Str::asSnakeCase($className)).'_UNIQ_IDENTIFIER_'.strtoupper(Str::asSnakeCase($userClassConfig->getIdentityPropertyName())),
                 'fields' => [$userClassConfig->getIdentityPropertyName()],
             ]
         );
diff --git a/tests/Security/UserClassBuilderTest.php b/tests/Security/UserClassBuilderTest.php
@@ -23,12 +23,12 @@ class UserClassBuilderTest extends TestCase
     /**
      * @dataProvider getUserInterfaceTests
      */
-    public function testAddUserInterfaceImplementation(UserClassConfiguration $userClassConfig, string $expectedFilename): void
+    public function testAddUserInterfaceImplementation(UserClassConfiguration $userClassConfig, string $expectedFilename, string $className): void
     {
         $manipulator = $this->getClassSourceManipulator($userClassConfig);
 
         $classBuilder = new UserClassBuilder();
-        $classBuilder->addUserInterfaceImplementation($manipulator, $userClassConfig);
+        $classBuilder->addUserInterfaceImplementation($manipulator, $userClassConfig, $className);
 
         $expectedPath = $this->getExpectedPath($expectedFilename, null);
         $expectedSource = file_get_contents($expectedPath);
@@ -49,36 +49,43 @@ public function getUserInterfaceTests(): \Generator
         yield 'entity_with_email_as_identifier' => [
             new UserClassConfiguration(true, 'email', true),
             'UserEntityWithEmailAsIdentifier.php',
+            'User',
         ];
 
         yield 'entity_with_password' => [
             new UserClassConfiguration(true, 'userIdentifier', true),
             'UserEntityWithPassword.php',
+            'User',
         ];
 
         yield 'entity_with_user_identifier_as_identifier' => [
             new UserClassConfiguration(true, 'user_identifier', true),
             'UserEntityWithUser_IdentifierAsIdentifier.php',
+            'User',
         ];
 
         yield 'entity_without_password' => [
             new UserClassConfiguration(true, 'userIdentifier', false),
             'UserEntityWithoutPassword.php',
+            'User',
         ];
 
         yield 'model_with_email_as_identifier' => [
             new UserClassConfiguration(false, 'email', true),
             'UserModelWithEmailAsIdentifier.php',
+            'User',
         ];
 
         yield 'model_with_password' => [
             new UserClassConfiguration(false, 'userIdentifier', true),
             'UserModelWithPassword.php',
+            'User',
         ];
 
         yield 'model_without_password' => [
             new UserClassConfiguration(false, 'userIdentifier', false),
             'UserModelWithoutPassword.php',
+            'User',
         ];
     }
 
diff --git a/tests/Security/fixtures/expected/UserEntityWithEmailAsIdentifier.php b/tests/Security/fixtures/expected/UserEntityWithEmailAsIdentifier.php
@@ -7,7 +7,7 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 
 #[ORM\Entity]
-#[ORM\UniqueConstraint(name: 'UNIQ_IDENTIFIER_EMAIL', fields: ['email'])]
+#[ORM\UniqueConstraint(name: 'USER_UNIQ_IDENTIFIER_EMAIL', fields: ['email'])]
 class User implements UserInterface, PasswordAuthenticatedUserInterface
 {
     #[ORM\Id]
diff --git a/tests/Security/fixtures/expected/UserEntityWithPassword.php b/tests/Security/fixtures/expected/UserEntityWithPassword.php
@@ -7,7 +7,7 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 
 #[ORM\Entity]
-#[ORM\UniqueConstraint(name: 'UNIQ_IDENTIFIER_USER_IDENTIFIER', fields: ['userIdentifier'])]
+#[ORM\UniqueConstraint(name: 'USER_UNIQ_IDENTIFIER_USER_IDENTIFIER', fields: ['userIdentifier'])]
 class User implements UserInterface, PasswordAuthenticatedUserInterface
 {
     #[ORM\Id]
diff --git a/tests/Security/fixtures/expected/UserEntityWithUser_IdentifierAsIdentifier.php b/tests/Security/fixtures/expected/UserEntityWithUser_IdentifierAsIdentifier.php
@@ -7,7 +7,7 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 
 #[ORM\Entity]
-#[ORM\UniqueConstraint(name: 'UNIQ_IDENTIFIER_USER_IDENTIFIER', fields: ['user_identifier'])]
+#[ORM\UniqueConstraint(name: 'USER_UNIQ_IDENTIFIER_USER_IDENTIFIER', fields: ['user_identifier'])]
 class User implements UserInterface, PasswordAuthenticatedUserInterface
 {
     #[ORM\Id]
diff --git a/tests/Security/fixtures/expected/UserEntityWithoutPassword.php b/tests/Security/fixtures/expected/UserEntityWithoutPassword.php
@@ -6,7 +6,7 @@
 use Symfony\Component\Security\Core\User\UserInterface;
 
 #[ORM\Entity]
-#[ORM\UniqueConstraint(name: 'UNIQ_IDENTIFIER_USER_IDENTIFIER', fields: ['userIdentifier'])]
+#[ORM\UniqueConstraint(name: 'USER_UNIQ_IDENTIFIER_USER_IDENTIFIER', fields: ['userIdentifier'])]
 class User implements UserInterface
 {
     #[ORM\Id]

Original file line number	Diff line number	Diff line change
`@@ -26,11 +26,11 @@`
`26`	`26`	`*/`
`27`	`27`	`final class UserClassBuilder`
`28`	`28`	`{`
`29`		`- public function addUserInterfaceImplementation(ClassSourceManipulator $manipulator, UserClassConfiguration $userClassConfig): void`
	`29`	`+ public function addUserInterfaceImplementation(ClassSourceManipulator $manipulator, UserClassConfiguration $userClassConfig, string $className): void`
`30`	`30`	`{`
`31`	`31`	`$manipulator->addInterface(UserInterface::class);`
`32`	`32`
`33`		`- $this->addUniqueConstraint($manipulator, $userClassConfig);`
	`33`	`+ $this->addUniqueConstraint($manipulator, $userClassConfig, $className);`
`34`	`34`
`35`	`35`	`$this->addGetUsername($manipulator, $userClassConfig);`
`36`	`36`
`@@ -332,7 +332,7 @@ private function addSerialize(ClassSourceManipulator $manipulator): void`
`332`	`332`	`$manipulator->addMethodBuilder($builder);`
`333`	`333`	`}`
`334`	`334`
`335`		`- private function addUniqueConstraint(ClassSourceManipulator $manipulator, UserClassConfiguration $userClassConfig): void`
	`335`	`+ private function addUniqueConstraint(ClassSourceManipulator $manipulator, UserClassConfiguration $userClassConfig, string $className): void`
`336`	`336`	`{`
`337`	`337`	`if (!$userClassConfig->isEntity()) {`
`338`	`338`	`return;`
`@@ -341,7 +341,7 @@ private function addUniqueConstraint(ClassSourceManipulator $manipulator, UserCl`
`341`	`341`	`$manipulator->addAttributeToClass(`
`342`	`342`	`'ORM\\UniqueConstraint',`
`343`	`343`	`[`
`344`		`- 'name' => 'UNIQ_IDENTIFIER_'.strtoupper(Str::asSnakeCase($userClassConfig->getIdentityPropertyName())),`
	`344`	`+ 'name' => strtoupper(Str::asSnakeCase($className)).'_UNIQ_IDENTIFIER_'.strtoupper(Str::asSnakeCase($userClassConfig->getIdentityPropertyName())),`
`345`	`345`	`'fields' => [$userClassConfig->getIdentityPropertyName()],`
`346`	`346`	`]`
`347`	`347`	`);`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`use Symfony\Component\Security\Core\User\UserInterface;`
`8`	`8`
`9`	`9`	`#[ORM\Entity]`
`10`		`-#[ORM\UniqueConstraint(name: 'UNIQ_IDENTIFIER_EMAIL', fields: ['email'])]`
	`10`	`+#[ORM\UniqueConstraint(name: 'USER_UNIQ_IDENTIFIER_EMAIL', fields: ['email'])]`
`11`	`11`	`class User implements UserInterface, PasswordAuthenticatedUserInterface`
`12`	`12`	`{`
`13`	`13`	`#[ORM\Id]`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`use Symfony\Component\Security\Core\User\UserInterface;`
`7`	`7`
`8`	`8`	`#[ORM\Entity]`
`9`		`-#[ORM\UniqueConstraint(name: 'UNIQ_IDENTIFIER_USER_IDENTIFIER', fields: ['userIdentifier'])]`
	`9`	`+#[ORM\UniqueConstraint(name: 'USER_UNIQ_IDENTIFIER_USER_IDENTIFIER', fields: ['userIdentifier'])]`
`10`	`10`	`class User implements UserInterface`
`11`	`11`	`{`
`12`	`12`	`#[ORM\Id]`