mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 02:51:04 +00:00
Code Issues Projects Releases Wiki Activity

Move User controller to Core

Browse source
This commit is contained in:
Yassine Guedidi 2023-12-30 23:23:27 +01:00
parent a615bcce55
commit 3d7bb85d71
4 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/config/routing.yml
View file

@ -3,11 +3,6 @@ wallabag_import:
type: annotation
prefix: /import
wallabag_user:
resource: "@WallabagUserBundle/Controller/"
type: annotation
prefix: /users
wallabag_api:
resource: "@WallabagApiBundle/Controller/"
type: annotation

4
app/config/services.yml
View file

@ -54,10 +54,6 @@ services:
resource: '../../src/Wallabag/ImportBundle/Controller/'
tags: ['controller.service_arguments']
Wallabag\UserBundle\Controller\:
resource: '../../src/Wallabag/UserBundle/Controller/'
tags: ['controller.service_arguments']
# inject alias service into controllers
Wallabag\ImportBundle\Controller\ChromeController:
arguments:

11
src/Wallabag/UserBundle/Controller/UserController.php → src/Wallabag/CoreBundle/Controller/UserController.php
View file

@ -1,6 +1,6 @@
<?php
namespace Wallabag\UserBundle\Controller;
namespace Wallabag\CoreBundle\Controller;
use Doctrine\ORM\EntityManagerInterface;
use FOS\UserBundle\Event\UserEvent;
@ -17,7 +17,6 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Contracts\Translation\TranslatorInterface;
use Wallabag\CoreBundle\Controller\AbstractController;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Form\NewUserType;
use Wallabag\UserBundle\Form\SearchUserType;
@ -41,7 +40,7 @@ class UserController extends AbstractController
/**
* Creates a new User entity.
*
* @Route("/new", name="user_new", methods={"GET", "POST"})
* @Route("/users/new", name="user_new", methods={"GET", "POST"})
*/
public function newAction(Request $request, UserManagerInterface $userManager, EventDispatcherInterface $eventDispatcher)
{
@ -77,7 +76,7 @@ class UserController extends AbstractController
/**
* Displays a form to edit an existing User entity.
*
* @Route("/{id}/edit", name="user_edit", methods={"GET", "POST"})
* @Route("/users/{id}/edit", name="user_edit", methods={"GET", "POST"})
*/
public function editAction(Request $request, User $user, UserManagerInterface $userManager, GoogleAuthenticatorInterface $googleAuthenticator)
{
@ -119,7 +118,7 @@ class UserController extends AbstractController
/**
* Deletes a User entity.
*
* @Route("/{id}", name="user_delete", methods={"DELETE"})
* @Route("/users/{id}", name="user_delete", methods={"DELETE"})
*/
public function deleteAction(Request $request, User $user)
{
@ -142,7 +141,7 @@ class UserController extends AbstractController
/**
* @param int $page
*
* @Route("/list/{page}", name="user_index", defaults={"page" = 1})
* @Route("/users/list/{page}", name="user_index", defaults={"page" = 1})
*
* Default parameter for page is hardcoded (in duplication of the defaults from the Route)
* because this controller is also called inside the layout template without any page as argument

2
tests/Wallabag/UserBundle/Controller/UserControllerTest.php → tests/Wallabag/CoreBundle/Controller/UserControllerTest.php
View file

@ -1,6 +1,6 @@
<?php
namespace Tests\Wallabag\UserBundle\Controller;
namespace Tests\Wallabag\CoreBundle\Controller;
use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;