Skip to content

Commit 4daae2f

Browse files
fix(entity): fix namespace for entity and repository
1 parent 1ef797c commit 4daae2f

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/Command/MakeTwcEntity.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,19 @@ final class MakeTwcEntity extends AbstractMaker implements InputAwareMakerInterf
5555

5656
private Generator $generator;
5757
private EntityClassGenerator $entityClassGenerator;
58+
private ContextGenerator $contextGenerator;
5859

5960
public function __construct(
6061
private FileManager $fileManager,
6162
private DoctrineHelper $doctrineHelper,
6263
?string $projectDirectory = null,
6364
?Generator $generator = null,
6465
?EntityClassGenerator $entityClassGenerator = null,
65-
private ContextGenerator $contextGenerator,
66+
ContextGenerator $contextGenerator,
67+
6668
) {
69+
$this->contextGenerator = $contextGenerator;
70+
6771
if (null !== $projectDirectory) {
6872
@trigger_error('The $projectDirectory constructor argument is no longer used since 1.41.0', \E_USER_DEPRECATED);
6973
}

src/Doctrine/EntityClassGenerator.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $
5252
$tableName = $this->doctrineHelper->getPotentialTableName($entityClassDetails->getFullName());
5353

5454
$useStatements = new UseStatementGenerator([
55-
$repoClassDetails->getFullName(),
55+
$generateRepositoryClass,
5656
['Doctrine\\ORM\\Mapping' => 'ORM'],
5757
]);
5858

@@ -102,7 +102,7 @@ public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $
102102
}else {
103103
$this->generateRepositoryClass(
104104
$generateRepositoryClass,
105-
$generateRepositoryClass,
105+
$entityClassDetails->getFullName(),
106106
$withPasswordUpgrade,
107107
true
108108
);
@@ -113,6 +113,7 @@ public function generateEntityClass(ClassNameDetails $entityClassDetails, bool $
113113

114114
public function generateRepositoryClass(string $repositoryClass, string $entityClass, bool $withPasswordUpgrade, bool $includeExampleComments = true): void
115115
{
116+
116117
$shortEntityClass = Str::getShortClassName($entityClass);
117118
$entityAlias = strtolower($shortEntityClass[0]);
118119

@@ -125,6 +126,7 @@ public function generateRepositoryClass(string $repositoryClass, string $entityC
125126
$interfaceClassNameDetails = new ClassNameDetails($passwordUserInterfaceName, 'Symfony\Component\Security\Core\User');
126127

127128
$useStatements = new UseStatementGenerator([
129+
$entityClass,
128130
ManagerRegistry::class,
129131
ServiceEntityRepository::class,
130132
]);

0 commit comments

Comments
 (0)