Skip to content

fix: optional identity #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 29, 2023
Merged

fix: optional identity #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
051ebfe
make identity optional when generating repository
janvt Mar 29, 2023
94cdabc
handle optional entity for mapping
janvt Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 23 additions & 24 deletions src/Maker/MakeModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
$identityClassNameDetails = $this->generateIdentity($modelName, $input, $io, $generator);
$this->generateEntityMappings($modelClassNameDetails, $input, $io, $generator);
$this->generateEntity($modelClassNameDetails, $input, $generator);
$this->generateRepository($modelClassNameDetails, $identityClassNameDetails, $input, $generator);
$this->generateRepository($generator, $input, $modelClassNameDetails, $identityClassNameDetails);

$this->writeSuccessMessage($io);
}
Expand Down Expand Up @@ -423,9 +423,9 @@ private function generateEntityMappings(
[
'model_class' => $modelClassNameDetails->getFullName(),
'has_identity' => $hasIdentity,
'type_name' => $this->templateVariables['type_name'],
'type_name' => $hasIdentity ?? $this->templateVariables['type_name'],
'table_name' => $tableName,
'identity_column_name' => $this->templateVariables['identity_type'],
'identity_column_name' => $hasIdentity ?? $this->templateVariables['identity_type'],
],
);
} catch (YamlManipulationFailedException $e) {
Expand Down Expand Up @@ -470,17 +470,16 @@ private function generateEntity(
/**
* Generate model repository
*
* @param ClassNameDetails $modelClassNameDetails
* @param ClassNameDetails $identityClassNameDetails
* @param InputInterface $input
* @param Generator $generator
* @throws \Exception
* @param InputInterface $input
* @param ClassNameDetails $modelClassNameDetails
* @param ?ClassNameDetails $identityClassNameDetails
*/
private function generateRepository(
ClassNameDetails $modelClassNameDetails,
ClassNameDetails $identityClassNameDetails,
Generator $generator,
InputInterface $input,
Generator $generator
ClassNameDetails $modelClassNameDetails,
?ClassNameDetails $identityClassNameDetails,
): void {
$interfaceNameDetails = $generator->createClassNameDetails(
$input->getArgument('name'),
Expand All @@ -489,10 +488,10 @@ private function generateRepository(
);

$this->generateRepositoryInterface(
$generator,
$interfaceNameDetails,
$modelClassNameDetails,
$identityClassNameDetails,
$generator
);

$implementationNameDetails = $generator->createClassNameDetails(
Expand All @@ -503,17 +502,17 @@ private function generateRepository(

$interfaceClassName = $interfaceNameDetails->getShortName() . 'Interface';
$templateVars = [
'use_statements' => new UseStatementGenerator([
'use_statements' => new UseStatementGenerator(array_filter([
$modelClassNameDetails->getFullName(),
$identityClassNameDetails->getFullName(),
$identityClassNameDetails?->getFullName(),
ManagerRegistry::class,
QueryBuilder::class,
[ OrmRepository::class => 'OrmRepository' ],
[ $interfaceNameDetails->getFullName() => $interfaceClassName ],
]),
])),
'interface_class_name' => $interfaceClassName,
'model_class_name' => $modelClassNameDetails->getShortName(),
'identity_class_name' => $identityClassNameDetails->getShortName()
'identity_class_name' => $identityClassNameDetails?->getShortName()
];

$templatePath = __DIR__.'/../Resources/skeleton/model/Repository.tpl.php';
Expand All @@ -529,26 +528,26 @@ private function generateRepository(
/**
* Generate model repository
*
* @param ClassNameDetails $classNameDetails
* @param ClassNameDetails $entityClassNameDetails
* @param ClassNameDetails $identityClassNameDetails
* @param Generator $generator
* @param ClassNameDetails $classNameDetails
* @param ClassNameDetails $modelClassNameDetails
* @param ?ClassNameDetails $identityClassNameDetails
* @throws \Exception
*/
private function generateRepositoryInterface(
Generator $generator,
ClassNameDetails $classNameDetails,
ClassNameDetails $modelClassNameDetails,
ClassNameDetails $identityClassNameDetails,
Generator $generator
?ClassNameDetails $identityClassNameDetails,
): void {
$templateVars = [
'use_statements' => new UseStatementGenerator([
'use_statements' => new UseStatementGenerator(array_filter([
$modelClassNameDetails->getFullName(),
$identityClassNameDetails->getFullName(),
$identityClassNameDetails?->getFullName(),
Repository::class,
]),
])),
'model_class_name' => $modelClassNameDetails->getShortName(),
'identity_class_name' => $identityClassNameDetails->getShortName()
'identity_class_name' => $identityClassNameDetails?->getShortName()
];

$templatePath = __DIR__.'/../Resources/skeleton/model/RepositoryInterface.tpl.php';
Expand Down
2 changes: 2 additions & 0 deletions src/Resources/skeleton/model/Repository.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@

class <?= $class_name ?> extends OrmRepository implements <?= $interface_class_name ?>
{
<?php if ($identity_class_name): ?>
public function findById(<?= $identity_class_name ?> $id): ?<?= $model_class_name ?>
{
// TODO: Implement me!

return null;
}
<?php endif; ?>

// public function findByExampleField($value): self
// {
Expand Down
2 changes: 2 additions & 0 deletions src/Resources/skeleton/model/RepositoryInterface.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,7 @@

interface <?= $class_name ?> extends Repository
{
<?php if ($identity_class_name): ?>
public function findById(<?= $identity_class_name ?> $id): ?<?= $model_class_name ?>;
<?php endif; ?>
}