Skip to content

Commit 13e8c20

Browse files
committed
bug #930 Add all missed dependencies to make:reset-password (upyx)
This PR was merged into the 1.0-dev branch. Discussion ---------- Add all missed dependencies to make:reset-password Closes #911 Commits ------- 48d03a1 Add all missed dependencies to make:reset-password
2 parents 2515e1a + 48d03a1 commit 13e8c20

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

src/Maker/MakeResetPassword.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
use Doctrine\Common\Annotations\Annotation;
1515
use PhpParser\Builder\Param;
16+
use Symfony\Bridge\Twig\AppVariable;
1617
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
1718
use Symfony\Bundle\MakerBundle\ConsoleStyle;
1819
use Symfony\Bundle\MakerBundle\DependencyBuilder;
@@ -30,8 +31,10 @@
3031
use Symfony\Bundle\MakerBundle\Util\TemplateComponentGenerator;
3132
use Symfony\Bundle\MakerBundle\Util\YamlSourceManipulator;
3233
use Symfony\Bundle\MakerBundle\Validator;
34+
use Symfony\Bundle\SecurityBundle\SecurityBundle;
3335
use Symfony\Component\Console\Command\Command;
3436
use Symfony\Component\Console\Input\InputInterface;
37+
use Symfony\Component\Form\Form;
3538
use Symfony\Component\HttpFoundation\RedirectResponse;
3639
use Symfony\Component\HttpFoundation\Request;
3740
use Symfony\Component\HttpFoundation\Response;
@@ -40,6 +43,7 @@
4043
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
4144
use Symfony\Component\Routing\Annotation\Route;
4245
use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
46+
use Symfony\Component\Validator\Validation;
4347
use Symfony\Component\Yaml\Yaml;
4448
use SymfonyCasts\Bundle\ResetPassword\Controller\ResetPasswordControllerTrait;
4549
use SymfonyCasts\Bundle\ResetPassword\Exception\ResetPasswordExceptionInterface;
@@ -102,6 +106,10 @@ public function configureDependencies(DependencyBuilder $dependencies): void
102106
{
103107
$dependencies->addClassDependency(SymfonyCastsResetPasswordBundle::class, 'symfonycasts/reset-password-bundle');
104108
$dependencies->addClassDependency(MailerInterface::class, 'symfony/mailer');
109+
$dependencies->addClassDependency(Form::class, 'symfony/form');
110+
$dependencies->addClassDependency(Validation::class, 'symfony/validator');
111+
$dependencies->addClassDependency(SecurityBundle::class, 'security-bundle');
112+
$dependencies->addClassDependency(AppVariable::class, 'twig');
105113

106114
ORMDependencyBuilder::buildDependencies($dependencies);
107115

tests/Maker/MakeResetPasswordTest.php

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ public function getTestDetails()
3030
'SymfonyCasts',
3131
])
3232
->setRequiredPhpVersion(70200)
33-
->addExtraDependencies('security-bundle')
34-
->addExtraDependencies('twig')
3533
->setFixtureFilesPath(__DIR__.'/../fixtures/MakeResetPassword')
3634
->assert(
3735
function (string $output, string $directory) {
@@ -76,8 +74,6 @@ function (string $output, string $directory) {
7674
'SymfonyCasts',
7775
])
7876
->setRequiredPhpVersion(70200)
79-
->addExtraDependencies('security-bundle')
80-
->addExtraDependencies('twig')
8177
->deleteFile('config/packages/reset_password.yaml')
8278
->setFixtureFilesPath(__DIR__.'/../fixtures/MakeResetPasswordCustomConfig')
8379
->assert(
@@ -103,8 +99,6 @@ function (string $output, string $directory) {
10399
'SymfonyCasts',
104100
])
105101
->setRequiredPhpVersion(70200)
106-
->addExtraDependencies('security-bundle')
107-
->addExtraDependencies('twig')
108102
->addReplacement(
109103
'config/packages/reset_password.yaml',
110104
'symfonycasts_reset_password:',
@@ -134,13 +128,6 @@ function (string $output, string $directory) {
134128
'SymfonyCasts',
135129
])
136130
->setRequiredPhpVersion(70200)
137-
->addExtraDependencies('doctrine')
138-
->addExtraDependencies('doctrine/annotations')
139-
->addExtraDependencies('mailer')
140-
->addExtraDependencies('security-bundle')
141-
->addExtraDependencies('symfony/form')
142-
->addExtraDependencies('symfony/validator')
143-
->addExtraDependencies('twig')
144131
->setFixtureFilesPath(__DIR__.'/../fixtures/MakeResetPasswordFunctionalTest'),
145132
];
146133

@@ -155,8 +142,6 @@ function (string $output, string $directory) {
155142
'SymfonyCasts',
156143
])
157144
->setRequiredPhpVersion(70200)
158-
->addExtraDependencies('security-bundle')
159-
->addExtraDependencies('twig')
160145
->setFixtureFilesPath(__DIR__.'/../fixtures/MakeResetPasswordCustomUserAttribute')
161146
->assert(
162147
function (string $output, string $directory) {

0 commit comments

Comments
 (0)