Skip to content
Closed
Changes from all commits
Commits
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
52 changes: 26 additions & 26 deletions src/Maker/MakeEntity.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,6 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
return;
}

$entityFinder = $this->fileManager->createFinder('src/Entity/')
// remove if/when we allow entities in subdirectories
->depth('<1')
->name('*.php');
$classes = [];
/** @var SplFileInfo $item */
foreach ($entityFinder as $item) {
if (!$item->getRelativePathname()) {
continue;
}

$classes[] = str_replace(['.php', '/'], ['', '\\'], $item->getRelativePathname());
}

$argument = $command->getDefinition()->getArgument('name');
$question = $this->createEntityClassQuestion($argument->getDescription());
$value = $io->askQuestion($question);
Expand Down Expand Up @@ -464,25 +450,39 @@ private function printAvailableTypes(ConsoleStyle $io)
$printSection($allTypes);
}

private function createEntityClassQuestion(string $questionText): Question
private function getEntityClasses(): array
{
$entityFinder = $this->fileManager->createFinder('src/Entity/')
// remove if/when we allow entities in subdirectories
->depth('<1')
->name('*.php');
$entityPath = $this->generator->getRootNamespace() ?
'src/'.$this->generator->getRootNamespace().'/Entity/' :
'src/Entity/';

$classes = [];
/** @var SplFileInfo $item */
foreach ($entityFinder as $item) {
if (!$item->getRelativePathname()) {
continue;
}
try {
$entityFinder = $this->fileManager->createFinder($entityPath)
// remove if/when we allow entities in subdirectories
->depth('<1')
->name('*.php');

/** @var SplFileInfo $item */
foreach ($entityFinder as $item) {
if (!$item->getRelativePathname()) {
continue;
}

$classes[] = str_replace('/', '\\', str_replace('.php', '', $item->getRelativePathname()));
$classes[] = str_replace('/', '\\', str_replace('.php', '', $item->getRelativePathname()));
}
} catch (\InvalidArgumentException $e) {
// no entity directory exists nothing to auto-complete
}

return $classes;
}

private function createEntityClassQuestion(string $questionText): Question
{
$question = new Question($questionText);
$question->setValidator([Validator::class, 'notBlank']);
$question->setAutocompleterValues($classes);
$question->setAutocompleterValues($this->getEntityClasses());

return $question;
}
Expand Down