[make:reset-password] doctrine/annotations are not needed (#1262)

Author: jrushlow

src/Maker/MakeResetPassword.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\MakerBundle\Maker;
 
-use Doctrine\Common\Annotations\Annotation;
 use Doctrine\ORM\EntityManagerInterface;
 use PhpParser\Builder\Param;
 use Symfony\Bridge\Twig\AppVariable;
@@ -122,8 +121,6 @@ public function configureDependencies(DependencyBuilder $dependencies): void
 
         ORMDependencyBuilder::buildDependencies($dependencies);
 
-        $dependencies->addClassDependency(Annotation::class, 'annotations');
-
         // reset-password-bundle 1.6 includes the ability to generate a fake token.
         // we need to check that version 1.6 is installed
         if (class_exists(ResetPasswordHelper::class) && !method_exists(ResetPasswordHelper::class, 'generateFakeResetToken')) {

tests/Maker/MakeResetPasswordTest.php

@@ -77,6 +77,11 @@ public function getTestDetails(): \Generator
                     'tests/ResetPasswordFunctionalTest.php'
                 );
 
+                if (60000 > $runner->getSymfonyVersion()) {
+                    // @legacy - In 5.4 tests, we need to tell Symfony to look for the route attributes in `src/Controller`
+                    $runner->copy('router-annotations.yaml', 'config/routes/annotations.yaml');
+                }
+
                 $runner->runTests();
             }),
         ];

tests/fixtures/make-reset-password/tests/it_generates_with_normal_setup.php

@@ -6,23 +6,23 @@
 
 class ResetPasswordFunctionalTest extends WebTestCase
 {
-    public function testResetRequestRoute()
+    public function testResetRequestRoute(): void
     {
         $client = static::createClient();
         $client->request('GET', '/reset-password');
 
         self::assertSame(200, $client->getResponse()->getStatusCode());
     }
 
-    public function testResetRequestRouteDeniesInvalidToken()
+    public function testResetRequestRouteDeniesInvalidToken(): void
     {
         $client = static::createClient();
         $client->request('GET', '/reset-password/reset/badToken1234');
 
         self::assertSame(302, $client->getResponse()->getStatusCode());
     }
 
-    public function testCheckEmailPageIsAlwaysAccessible()
+    public function testCheckEmailPageIsAlwaysAccessible(): void
     {
         $client = static::createClient();
         $client->request('GET', '/reset-password/check-email');