Skip to content

Commit 2dd2166

Browse files
authored
Merge pull request #81 from magento-atwix-pyrrans/AC-2751-upgrade-symfony-to-latest-lts
[Pyrrans] Upgrade Symfony to the latest LTS version
2 parents d3b0003 + 6583e3d commit 2dd2166

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

ReCaptchaUser/Command/DisableReCaptchaForUserForgotPasswordCommand.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Magento\ReCaptchaUser\Command;
99

10+
use Magento\Framework\Console\Cli;
1011
use Magento\ReCaptchaUser\Model\DisableReCaptchaForUserForgotPassword;
1112
use Symfony\Component\Console\Command\Command;
1213
use Symfony\Component\Console\Input\InputInterface;
@@ -47,5 +48,7 @@ protected function configure()
4748
protected function execute(InputInterface $input, OutputInterface $output)
4849
{
4950
$this->disableReCaptchaForUserForgotPassword->execute();
51+
52+
return Cli::RETURN_SUCCESS;
5053
}
5154
}

ReCaptchaUser/Command/DisableReCaptchaForUserLoginCommand.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Magento\ReCaptchaUser\Command;
99

10+
use Magento\Framework\Console\Cli;
1011
use Magento\ReCaptchaUser\Model\DisableReCaptchaForUserLogin;
1112
use Symfony\Component\Console\Command\Command;
1213
use Symfony\Component\Console\Input\InputInterface;
@@ -47,5 +48,7 @@ protected function configure()
4748
protected function execute(InputInterface $input, OutputInterface $output)
4849
{
4950
$this->disableReCaptchaForUserLogin->execute();
51+
52+
return Cli::RETURN_SUCCESS;
5053
}
5154
}

TwoFactorAuth/Command/GoogleSecret.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Magento\TwoFactorAuth\Command;
99

10+
use Magento\Framework\Console\Cli;
1011
use Magento\Framework\Exception\LocalizedException;
1112
use Magento\TwoFactorAuth\Api\UserConfigManagerInterface;
1213
use Magento\TwoFactorAuth\Model\Provider\Engine\Google;
@@ -68,8 +69,8 @@ protected function configure()
6869
$this->setName('security:tfa:google:set-secret');
6970
$this->setDescription('Set the secret used for Google OTP generation.');
7071

71-
$this->addArgument('user', InputArgument::REQUIRED, __('Username'));
72-
$this->addArgument('secret', InputArgument::REQUIRED, __('Secret'));
72+
$this->addArgument('user', InputArgument::REQUIRED, __('Username')->render());
73+
$this->addArgument('secret', InputArgument::REQUIRED, __('Secret')->render());
7374

7475
parent::configure();
7576
}
@@ -104,5 +105,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
104105
);
105106

106107
$output->writeln((string)__('Google OTP secret has been set'));
108+
109+
return Cli::RETURN_SUCCESS;
107110
}
108111
}

TwoFactorAuth/Command/TfaReset.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ protected function configure()
6969
$this->setName('security:tfa:reset');
7070
$this->setDescription('Reset configuration for one user');
7171

72-
$this->addArgument('user', InputArgument::REQUIRED, __('Username'));
73-
$this->addArgument('provider', InputArgument::REQUIRED, __('Provider code'));
72+
$this->addArgument('user', InputArgument::REQUIRED, __('Username')->render());
73+
$this->addArgument('provider', InputArgument::REQUIRED, __('Provider code')->render());
7474

7575
parent::configure();
7676
}

0 commit comments

Comments
 (0)