Skip to content
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

[make:*] use sorted use statements #1106

Merged
merged 21 commits into from
May 3, 2022
Merged

[make:*] use sorted use statements #1106

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4236947
[make:command] use sorted use statements
jrushlow Apr 25, 2022
fee8455
[make:controller] use sorted use statements
jrushlow Apr 25, 2022
e0165f2
[make:crud] use sorted use statements
jrushlow Apr 25, 2022
6d3c3b1
[make:subscriber] use sorted use statements
jrushlow Apr 25, 2022
f953fbd
[make:form] use sorted use statements
jrushlow Apr 25, 2022
56fefaf
[make:message] use sorted use statements
jrushlow Apr 25, 2022
1c50f1f
[make:middleware] use sorted use statements
jrushlow Apr 25, 2022
93f3dba
[make:reset-password] use sorted use statements
jrushlow Apr 25, 2022
a5094a9
[make:serializer] use sorted use statements
jrushlow Apr 25, 2022
bd9786f
[make:twig] use sorted use statements
jrushlow Apr 25, 2022
e640615
[make:test*] use sorted use statements
jrushlow Apr 25, 2022
1426a30
[make:registration] use sorted use statements
jrushlow Apr 26, 2022
248bdb6
use a collection to store use statements
jrushlow Apr 28, 2022
18a634b
implement use statement collections
jrushlow Apr 28, 2022
22488aa
php cs fixer it up
jrushlow Apr 28, 2022
8147cb2
move logic to self contained generator
jrushlow Apr 28, 2022
c85d743
move logic to self contained generator
jrushlow Apr 28, 2022
41fd890
its stringable
jrushlow Apr 28, 2022
5e0216b
cast stringable in test
jrushlow Apr 28, 2022
9c4c4e6
always use cacheable interface
jrushlow May 2, 2022
e429059
use required php version instead
jrushlow May 2, 2022
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
Prev Previous commit
Next Next commit
[make:message] use sorted use statements
  • Loading branch information
@jrushlow
jrushlow committed Apr 26, 2022
commit 56fefafea399bc2f6eed8d66bda82abcb377b5d7
19 changes: 13 additions & 6 deletions src/Maker/MakeMessage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
use Symfony\Bundle\MakerBundle\FileManager;
use Symfony\Bundle\MakerBundle\Generator;
use Symfony\Bundle\MakerBundle\InputConfiguration;
use Symfony\Bundle\MakerBundle\Util\TemplateComponentGenerator;
use Symfony\Bundle\MakerBundle\Util\YamlSourceManipulator;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
use Symfony\Component\Messenger\MessageBusInterface;

/**
Expand Down Expand Up @@ -47,15 +49,15 @@ public static function getCommandDescription(): string
return 'Creates a new message and handler';
}

public function configureCommand(Command $command, InputConfiguration $inputConf)
public function configureCommand(Command $command, InputConfiguration $inputConfig): void
{
$command
->addArgument('name', InputArgument::OPTIONAL, 'The name of the message class (e.g. <fg=yellow>SendEmailMessage</>)')
->setHelp(file_get_contents(__DIR__.'/../Resources/help/MakeMessage.txt'))
;
}

public function interact(InputInterface $input, ConsoleStyle $io, Command $command)
public function interact(InputInterface $input, ConsoleStyle $io, Command $command): void
{
$command->addArgument('chosen-transport', InputArgument::OPTIONAL);

Expand Down Expand Up @@ -83,7 +85,7 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
}
}

public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator)
public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator): void
{
$messageClassNameDetails = $generator->createClassNameDetails(
$input->getArgument('name'),
Expand All @@ -101,11 +103,16 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
'message/Message.tpl.php'
);

$useStatements = [
MessageHandlerInterface::class,
$messageClassNameDetails->getFullName(),
];

$generator->generateClass(
$handlerClassNameDetails->getFullName(),
'message/MessageHandler.tpl.php',
[
'message_full_class_name' => $messageClassNameDetails->getFullName(),
'use_statements' => TemplateComponentGenerator::generateUseStatements($useStatements),
'message_class_name' => $messageClassNameDetails->getShortName(),
]
);
Expand All @@ -125,7 +132,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
]);
}

private function updateMessengerConfig(Generator $generator, string $chosenTransport, string $messageClass)
private function updateMessengerConfig(Generator $generator, string $chosenTransport, string $messageClass): void
{
$manipulator = new YamlSourceManipulator($this->fileManager->getFileContents($configFilePath = 'config/packages/messenger.yaml'));
$messengerData = $manipulator->getData();
Expand All @@ -140,7 +147,7 @@ private function updateMessengerConfig(Generator $generator, string $chosenTrans
$generator->dumpFile($configFilePath, $manipulator->getContents());
}

public function configureDependencies(DependencyBuilder $dependencies)
public function configureDependencies(DependencyBuilder $dependencies): void
{
$dependencies->addClassDependency(
MessageBusInterface::class,
Expand Down
3 changes: 1 addition & 2 deletions src/Resources/skeleton/message/MessageHandler.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

namespace <?= $namespace; ?>;

use <?= $message_full_class_name ?>;
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
<?= $use_statements; ?>

final class <?= $class_name ?> implements MessageHandlerInterface
{
Expand Down