kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch '1.5' into 1.6

Browse source 
* 1.5:
  [SyliusUserBundle] Improve output of PromoteUserCommand and DemoteUserCommand
This commit is contained in:
Łukasz Chruściel 2019-12-11 14:38:11 +01:00
commit 5b8d1771d6
No known key found for this signature in database
GPG key ID: 428B9D810DB2ACDF
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Sylius/Bundle/UserBundle/Command/DemoteUserCommand.php
View file

@ -49,21 +49,25 @@ EOT
protected function executeRoleCommand(InputInterface $input, OutputInterface $output, UserInterface $user, array $securityRoles): void
{
$error = false;
$successMessages = [];
foreach ($securityRoles as $securityRole) {
if (!$user->hasRole($securityRole)) {
$output->writeln(sprintf('<error>User "%s" didn\'t have "%s" Security role.</error>', $user->getEmail(), $securityRole));
$output->writeln(sprintf('<error>User "%s" doesn\'t have "%s" Security role.</error>', $user->getEmail(), $securityRole));
$error = true;
continue;
}
$user->removeRole($securityRole);
$output->writeln(sprintf('Security role <comment>%s</comment> has been removed from user <comment>%s</comment>', $securityRole, $user->getEmail()));
$successMessages[] = sprintf('Security role <comment>%s</comment> has been removed from user <comment>%s</comment>', $securityRole, $user->getEmail());
}
if (!$error) {
$output->writeln($successMessages);
$this->getEntityManager($input->getOption('user-type'))->flush();
} else {
$output->writeln(sprintf('<error>No roles removed from User "%s".</error>', $user->getEmail()));
}
}
}

8
src/Sylius/Bundle/UserBundle/Command/PromoteUserCommand.php
View file

@ -49,21 +49,25 @@ EOT
protected function executeRoleCommand(InputInterface $input, OutputInterface $output, UserInterface $user, array $securityRoles): void
{
$error = false;
$successMessages = [];
foreach ($securityRoles as $securityRole) {
if ($user->hasRole($securityRole)) {
$output->writeln(sprintf('<error>User "%s" did already have "%s" security role.</error>', $user->getEmail(), $securityRole));
$output->writeln(sprintf('<error>User "%s" already has "%s" security role.</error>', $user->getEmail(), $securityRole));
$error = true;
continue;
}
$user->addRole($securityRole);
$output->writeln(sprintf('Security role <comment>%s</comment> has been added to user <comment>%s</comment>', $securityRole, $user->getEmail()));
$successMessages[] = sprintf('Security role <comment>%s</comment> has been added to user <comment>%s</comment>', $securityRole, $user->getEmail());
}
if (!$error) {
$output->writeln($successMessages);
$this->getEntityManager($input->getOption('user-type'))->flush();
} else {
$output->writeln(sprintf('<error>No roles added to User "%s".</error>', $user->getEmail()));
}
}
}