Merge pull request #5746 from yguedidi/remove-bundle-inheritance

2024-11-26 19:11:07 +00:00 · 2022-04-24 08:07:09 +02:00 · 2022-04-24 08:07:09 +02:00 · 7e6d0d61db
commit 7e6d0d61db
parent 88fd7afeb5 82fc828442
11 changed files with 12 additions and 4 deletions
--- a/src/Wallabag/UserBundle/Resources/views/ChangePassword/changePassword_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/ChangePassword/changePassword_content.html.twig
--- a/src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Registration/check_email.html.twig
--- a/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Registration/confirmed.html.twig
--- a/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Registration/register_content.html.twig
--- a/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Resetting/check_email.html.twig
--- a/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Resetting/request_content.html.twig
--- a/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Resetting/reset_content.html.twig
--- a/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Security/login.html.twig
--- a/src/Wallabag/UserBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@ -41,6 +41,18 @@ homepage:
 fos_user:
    resource: "@FOSUserBundle/Resources/config/routing/all.xml"

+fos_user_security_login:
+    path: /login
+    defaults:
+        _controller: Wallabag\UserBundle\Controller\SecurityController::loginAction
+    methods: [GET, POST]
+
+fos_user_registration_register:
+    path: /register
+    defaults:
+        _controller: Wallabag\UserBundle\Controller\RegistrationController::registerAction
+    methods: [GET, POST]
+
 fos_oauth_server_token:
    resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"

--- a/src/Wallabag/UserBundle/WallabagUserBundle.php
+++ b/src/Wallabag/UserBundle/WallabagUserBundle.php
@ -6,8 +6,4 @@ use Symfony\Component\HttpKernel\Bundle\Bundle;

 class WallabagUserBundle extends Bundle
 {
-    public function getParent()
-    {
-        return 'FOSUserBundle';
-    }
 }