Remove compatibility with 6.3

symfony · Mar 7, 2024 · 72784c0 · 72784c0
1 parent ce2bfd3
commit 72784c0
Show file tree

Hide file tree

Showing 16 changed files with 11 additions and 303 deletions.
diff --git a/src/Maker/MakeAuthenticator.php b/src/Maker/MakeAuthenticator.php
@@ -24,7 +24,6 @@
 use Symfony\Bundle\MakerBundle\Security\SecurityControllerBuilder;
 use Symfony\Bundle\MakerBundle\Str;
 use Symfony\Bundle\MakerBundle\Util\ClassSourceManipulator;
-use Symfony\Bundle\MakerBundle\Util\FeatureSupportTrait;
 use Symfony\Bundle\MakerBundle\Util\UseStatementGenerator;
 use Symfony\Bundle\MakerBundle\Util\YamlManipulationFailedException;
 use Symfony\Bundle\MakerBundle\Util\YamlSourceManipulator;
@@ -63,7 +62,6 @@
  */
 final class MakeAuthenticator extends AbstractMaker
 {
-    use FeatureSupportTrait;
     private const AUTH_TYPE_EMPTY_AUTHENTICATOR = 'empty-authenticator';
     private const AUTH_TYPE_FORM_LOGIN = 'form-login';
 
@@ -278,7 +276,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                 $input->hasArgument('logout-setup') ? $input->getArgument('logout-setup') : false,
                 $supportRememberMe,
                 $alwaysRememberMe,
-                $this->supportsLogoutRouteLoader() && !file_exists('config/routes/security.yaml'),
+                !file_exists('config/routes/security.yaml'),
             )
         );
     }
@@ -383,10 +381,6 @@ private function generateFormLoginFiles(string $controllerClass, string $userNam
 
         $this->securityControllerBuilder->addLoginMethod($manipulator);
 
-        if ($logoutSetup && !$this->supportsLogoutRouteLoader()) {
-            $this->securityControllerBuilder->addLogoutMethod($manipulator);
-        }
-
         $this->generator->dumpFile($controllerPath, $manipulator->getSourceCode());
 
         // create login form template
@@ -404,7 +398,7 @@ private function generateFormLoginFiles(string $controllerClass, string $userNam
         );
     }
 
-    private function generateNextMessage(bool $securityYamlUpdated, string $authenticatorType, string $authenticatorClass, $userClass, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe, bool $defaultSecurityRoute): array
+    private function generateNextMessage(bool $securityYamlUpdated, string $authenticatorType, string $authenticatorClass, $userClass, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe, bool $hasSecurityRouteFile): array
     {
         $nextTexts = ['Next:'];
         $nextTexts[] = '- Customize your new authenticator.';
@@ -433,7 +427,9 @@ private function generateNextMessage(bool $securityYamlUpdated, string $authenti
         }
 
         // If the security.logout_route_loader is not loaded from the default flex recipe
-        $nextTexts[] = '- Be sure to add the "logout" route to <info>config/routes/security.yaml</info> or upgrade the <info>symfony/security-bundle</info> recipe.';
+        if (!$hasSecurityRouteFile) {
+            $nextTexts[] = '- Be sure to add the "logout" route to <info>config/routes/security.yaml</info> or upgrade the <info>symfony/security-bundle</info> recipe.';
+        }
 
         return $nextTexts;
     }

diff --git a/src/Maker/Security/MakeFormLogin.php b/src/Maker/Security/MakeFormLogin.php
@@ -25,7 +25,6 @@
 use Symfony\Bundle\MakerBundle\Security\SecurityControllerBuilder;
 use Symfony\Bundle\MakerBundle\Str;
 use Symfony\Bundle\MakerBundle\Util\ClassSourceManipulator;
-use Symfony\Bundle\MakerBundle\Util\FeatureSupportTrait;
 use Symfony\Bundle\MakerBundle\Util\UseStatementGenerator;
 use Symfony\Bundle\MakerBundle\Util\YamlSourceManipulator;
 use Symfony\Bundle\MakerBundle\Validator;
@@ -49,8 +48,6 @@
  */
 final class MakeFormLogin extends AbstractMaker
 {
-    use FeatureSupportTrait;
-
     private const SECURITY_CONFIG_PATH = 'config/packages/security.yaml';
     private YamlSourceManipulator $ysm;
     private string $controllerName;
@@ -136,7 +133,7 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
         $controllerNameDetails = $generator->createClassNameDetails($this->controllerName, 'Controller\\', 'Controller');
         $templatePath = strtolower($controllerNameDetails->getRelativeNameWithoutSuffix());
 
-        $controllerPath = $generator->generateController(
+        $generator->generateController(
             $controllerNameDetails->getFullName(),
             'security/formLogin/LoginController.tpl.php',
             [
@@ -146,14 +143,6 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             ]
         );
 
-        if ($this->willLogout && !$this->supportsLogoutRouteLoader()) {
-            $manipulator = new ClassSourceManipulator($generator->getFileContentsForPendingOperation($controllerPath));
-
-            $this->securityControllerBuilder->addLogoutMethod($manipulator);
-
-            $generator->dumpFile($controllerPath, $manipulator->getSourceCode());
-        }
-
         $generator->generateTemplate(
             sprintf('%s/login.html.twig', $templatePath),
             'security/formLogin/login_form.tpl.php',

diff --git a/src/Util/FeatureSupportTrait.php b/src/Util/FeatureSupportTrait.php
diff --git a/tests/Maker/MakeAuthenticatorTest.php b/tests/Maker/MakeAuthenticatorTest.php
@@ -269,50 +269,6 @@ public function getTestDetails(): \Generator
                 $this->assertFileExists($runner->getPath('templates/security/login.html.twig'));
                 $this->assertFileExists($runner->getPath('src/Security/AppCustomAuthenticator.php'));
 
-                $securityConfig = $runner->readYaml('config/packages/security.yaml');
-                $this->assertEquals(
-                    'app_logout',
-                    $securityConfig['security']['firewalls']['main']['logout']['path']
-                );
-            }),
-        ];
-
-        yield 'auth_login_form_user_entity_with_logout_route_loader' => [$this->createMakerTest()
-            ->addExtraDependencies('doctrine', 'twig', 'symfony/form')
-            ->run(function (MakerTestRunner $runner) {
-                $this->makeUser($runner, 'userEmail');
-                // We pretend that the LogoutRouteLoader is registered
-                $runner->addToAutoloader('Symfony\\Bundle\\SecurityBundle\\Routing\\', \dirname(__DIR__).'/fixtures/security-bundle/routing/');
-                $runner->modifyYamlFile('config/services.yaml', function (array $config) {
-                    $config['services']['security.route_loader.logout'] = [
-                        'class' => 'Symfony\Bundle\SecurityBundle\\Routing\\LogoutRouteLoader',
-                        'tags' => ['routing.route_loader'],
-                    ];
-
-                    return $config;
-                });
-                $output = $runner->runMaker([
-                    // authenticator type => login-form
-                    1,
-                    // class name
-                    'AppCustomAuthenticator',
-                    // controller name
-                    'SecurityController',
-                    // logout support
-                    'yes',
-                    // remember me support => no
-                    'no',
-                ]);
-
-                $this->runLoginTest($runner, 'userEmail', true, 'App\\Entity\\User', true);
-
-                $this->assertStringContainsString('Success', $output);
-
-                $this->assertFileExists($runner->getPath('src/Controller/SecurityController.php'));
-                $this->assertFileEquals(\dirname(__DIR__).'/fixtures/make-auth/SecurityController-no-logout.php', $runner->getPath('src/Controller/SecurityController.php'));
-                $this->assertFileExists($runner->getPath('templates/security/login.html.twig'));
-                $this->assertFileExists($runner->getPath('src/Security/AppCustomAuthenticator.php'));
-
                 $securityConfig = $runner->readYaml('config/packages/security.yaml');
                 $this->assertEquals(
                     '/logout',

diff --git a/tests/Maker/Security/MakeFormLoginTest.php b/tests/Maker/Security/MakeFormLoginTest.php
@@ -48,7 +48,7 @@ public function getTestDetails(): \Generator
                 $this->assertSame('app_login', $securityConfig['security']['firewalls']['main']['form_login']['login_path']);
                 $this->assertSame('app_login', $securityConfig['security']['firewalls']['main']['form_login']['check_path']);
                 $this->assertTrue($securityConfig['security']['firewalls']['main']['form_login']['enable_csrf']);
-                $this->assertSame('app_logout', $securityConfig['security']['firewalls']['main']['logout']['path']);
+                $this->assertSame('/logout', $securityConfig['security']['firewalls']['main']['logout']['path']);
 
                 $this->runLoginTest($runner);
             }),
@@ -66,7 +66,7 @@ public function getTestDetails(): \Generator
                 $this->assertStringContainsString('Success', $output);
                 $fixturePath = \dirname(__DIR__, 2).'/fixtures/security/make-form-login/expected';
 
-                $this->assertFileEquals($fixturePath.'/SecurityControllerWithoutLogout.php', $runner->getPath('src/Controller/SecurityController.php'));
+                $this->assertFileEquals($fixturePath.'/SecurityController.php', $runner->getPath('src/Controller/SecurityController.php'));
                 $this->assertFileEquals($fixturePath.'/login_no_logout.html.twig', $runner->getPath('templates/security/login.html.twig'));
 
                 $securityConfig = $runner->readYaml('config/packages/security.yaml');
@@ -94,30 +94,6 @@ public function getTestDetails(): \Generator
 
                 $securityConfig = $runner->readYaml('config/packages/security.yaml');
 
-                $this->assertSame('app_login', $securityConfig['security']['firewalls']['main']['form_login']['login_path']);
-                $this->assertSame('app_login', $securityConfig['security']['firewalls']['main']['form_login']['check_path']);
-                $this->assertSame('app_logout', $securityConfig['security']['firewalls']['main']['logout']['path']);
-            }),
-        ];
-
-        yield 'generates_form_login_with_logout_with_route_loader' => [$this->createMakerTest()
-            ->run(function (MakerTestRunner $runner) {
-                // We pretend that the LogoutRouteLoader is registered
-                $runner->addToAutoloader('Symfony\\Bundle\\SecurityBundle\\Routing\\', \dirname(__DIR__, 2).'/fixtures/security-bundle/routing');
-                $this->makeUser($runner);
-                $output = $runner->runMaker([
-                    'SecurityController', // Controller Name
-                    'y', // Generate Logout
-                ]);
-
-                $this->assertStringContainsString('Success', $output);
-                $fixturePath = \dirname(__DIR__, 2).'/fixtures/security/make-form-login/expected';
-
-                $this->assertFileEquals($fixturePath.'/SecurityControllerLogoutRouteLoader.php', $runner->getPath('src/Controller/SecurityController.php'));
-                $this->assertFileEquals($fixturePath.'/login_routeloader_logout.html.twig', $runner->getPath('templates/security/login.html.twig'));
-
-                $securityConfig = $runner->readYaml('config/packages/security.yaml');
-
                 $this->assertSame('app_login', $securityConfig['security']['firewalls']['main']['form_login']['login_path']);
                 $this->assertSame('app_login', $securityConfig['security']['firewalls']['main']['form_login']['check_path']);
                 $this->assertSame('/logout', $securityConfig['security']['firewalls']['main']['logout']['path']);

diff --git a/tests/Security/SecurityConfigUpdaterTest.php b/tests/Security/SecurityConfigUpdaterTest.php
@@ -104,14 +104,11 @@ public function getUserClassTests(): \Generator
     /**
      * @dataProvider getAuthenticatorTests
      */
-    public function testUpdateForAuthenticator(string $firewallName, $entryPoint, string $expectedSourceFilename, string $startingSourceFilename, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe, bool $useLogoutRouteLoader = false): void
+    public function testUpdateForAuthenticator(string $firewallName, $entryPoint, string $expectedSourceFilename, string $startingSourceFilename, bool $logoutSetup, bool $supportRememberMe, bool $alwaysRememberMe): void
     {
         $this->createLogger();
 
         $updater = new SecurityConfigUpdater($this->ysmLogger);
-        if ($useLogoutRouteLoader) {
-            $updater->forceSupportLogoutRouteLoader();
-        }
         $source = file_get_contents(__DIR__.'/yaml_fixtures/source/'.$startingSourceFilename);
         $actualSource = $updater->updateForAuthenticator($source, $firewallName, $entryPoint, 'App\\Security\\AppCustomAuthenticator', $logoutSetup, $supportRememberMe, $alwaysRememberMe);
         $expectedSource = file_get_contents(__DIR__.'/yaml_fixtures/expected_authenticator/'.$expectedSourceFilename);
@@ -200,17 +197,6 @@ public function getAuthenticatorTests(): \Generator
             true,
             true,
         ];
-
-        yield 'simple_security_with_firewalls_and_logout_via_loader' => [
-            'main',
-            'App\\Security\\AppCustomAuthenticator',
-            'simple_security_with_firewalls_and_logout_via_loader.yaml',
-            'simple_security_with_firewalls_and_logout.yaml',
-            true,
-            false,
-            false,
-            true,
-        ];
     }
 
     public function testUpdateForFormLogin(): void

diff --git a/...urity/yaml_fixtures/expected_authenticator/simple_security_with_firewalls_and_logout.yaml b/...urity/yaml_fixtures/expected_authenticator/simple_security_with_firewalls_and_logout.yaml
@@ -16,6 +16,6 @@ security:
             # the entry_point start() method determines what happens when an anonymous user accesses a protected page
             entry_point: App\Security\AppCustomAuthenticator
             logout:
-                path: app_logout
+                path: /logout
                 # where to redirect after logout
                 # target: app_any_route
diff --git a/...fixtures/expected_authenticator/simple_security_with_firewalls_and_logout_via_loader.yaml b/...fixtures/expected_authenticator/simple_security_with_firewalls_and_logout_via_loader.yaml
diff --git a/tests/Security/yaml_fixtures/expected_logout/logout.yaml b/tests/Security/yaml_fixtures/expected_logout/logout.yaml
@@ -12,6 +12,6 @@ security:
         main:
             lazy: true
             logout:
-                path: app_logout
+                path: /logout
                 # where to redirect after logout
                 # target: app_any_route
diff --git a/tests/fixtures/make-auth/SecurityController-no-logout.php b/tests/fixtures/make-auth/SecurityController-no-logout.php
diff --git a/tests/fixtures/security-bundle/routing/LogoutRouteLoader.php b/tests/fixtures/security-bundle/routing/LogoutRouteLoader.php
diff --git a/tests/fixtures/security/make-form-login/expected/LoginController.php b/tests/fixtures/security/make-form-login/expected/LoginController.php
@@ -23,10 +23,4 @@ public function login(AuthenticationUtils $authenticationUtils): Response
             'error' => $error,
         ]);
     }
-
-    #[Route(path: '/logout', name: 'app_logout')]
-    public function logout(): void
-    {
-        throw new \LogicException('This method can be blank - it will be intercepted by the logout key on your firewall.');
-    }
 }
diff --git a/tests/fixtures/security/make-form-login/expected/SecurityController.php b/tests/fixtures/security/make-form-login/expected/SecurityController.php
@@ -23,10 +23,4 @@ public function login(AuthenticationUtils $authenticationUtils): Response
             'error' => $error,
         ]);
     }
-
-    #[Route(path: '/logout', name: 'app_logout')]
-    public function logout(): void
-    {
-        throw new \LogicException('This method can be blank - it will be intercepted by the logout key on your firewall.');
-    }
 }
diff --git a/tests/fixtures/security/make-form-login/expected/SecurityControllerLogoutRouteLoader.php b/tests/fixtures/security/make-form-login/expected/SecurityControllerLogoutRouteLoader.php