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

bug #10863 [SyliusUserBundle] Improve output of Promote/DemoteUserCommand (markbeazley)

Browse source 
This PR was merged into the 1.5 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.5
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | fixes #10862
| License         | MIT

A quick fix to make it clearer to users that if an error happens the user's roles are unchanged. Previously it was showing both success and error messages which gave the impression other role changes that didn't trigger an error had been applied when they hadn't (the entity is only flushed if no errors happen).

<!--
 - Bug fixes must be submitted against the 1.4, 1.5 or 1.6 branch (the lowest possible)
 - Features and deprecations must be submitted against the master branch
 - Make sure that the correct base branch is set
-->


Commits
-------

7350d7c0d3 [SyliusUserBundle] Improve output of PromoteUserCommand and DemoteUserCommand
This commit is contained in:
Łukasz Chruściel 2019-12-11 14:36:10 +01:00 • committed by GitHub
commit c5f5fff689
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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()));
}
}
}