diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-07-03 13:39:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-03 13:39:54 +0200 |
commit | 71e1cbc8eb5928d393b0772055d6b711e90a09b3 (patch) | |
tree | 71795eadcf13fda9198b8cd9a3da26d51826bbd9 /src/Wallabag/UserBundle/Controller/ManageController.php | |
parent | 822c877949aff8ae57677671115f8f4fc69588d5 (diff) | |
parent | 38520658addc217f127b0627ea28dcf8d6e6178c (diff) | |
download | wallabag-71e1cbc8eb5928d393b0772055d6b711e90a09b3.tar.gz wallabag-71e1cbc8eb5928d393b0772055d6b711e90a09b3.tar.zst wallabag-71e1cbc8eb5928d393b0772055d6b711e90a09b3.zip |
Merge pull request #3258 from wallabag/cs-fixer
Add a real configuration for CS-Fixer
Diffstat (limited to 'src/Wallabag/UserBundle/Controller/ManageController.php')
-rw-r--r-- | src/Wallabag/UserBundle/Controller/ManageController.php | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/src/Wallabag/UserBundle/Controller/ManageController.php b/src/Wallabag/UserBundle/Controller/ManageController.php index 084f2c67..f3de656f 100644 --- a/src/Wallabag/UserBundle/Controller/ManageController.php +++ b/src/Wallabag/UserBundle/Controller/ManageController.php | |||
@@ -7,10 +7,10 @@ use FOS\UserBundle\FOSUserEvents; | |||
7 | use Pagerfanta\Adapter\DoctrineORMAdapter; | 7 | use Pagerfanta\Adapter\DoctrineORMAdapter; |
8 | use Pagerfanta\Exception\OutOfRangeCurrentPageException; | 8 | use Pagerfanta\Exception\OutOfRangeCurrentPageException; |
9 | use Pagerfanta\Pagerfanta; | 9 | use Pagerfanta\Pagerfanta; |
10 | use Symfony\Component\HttpFoundation\Request; | ||
11 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | ||
12 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; | 10 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; |
13 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 11 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
12 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | ||
13 | use Symfony\Component\HttpFoundation\Request; | ||
14 | use Wallabag\UserBundle\Entity\User; | 14 | use Wallabag\UserBundle\Entity\User; |
15 | use Wallabag\UserBundle\Form\SearchUserType; | 15 | use Wallabag\UserBundle\Form\SearchUserType; |
16 | 16 | ||
@@ -48,13 +48,13 @@ class ManageController extends Controller | |||
48 | $this->get('translator')->trans('flashes.user.notice.added', ['%username%' => $user->getUsername()]) | 48 | $this->get('translator')->trans('flashes.user.notice.added', ['%username%' => $user->getUsername()]) |
49 | ); | 49 | ); |
50 | 50 | ||
51 | return $this->redirectToRoute('user_edit', array('id' => $user->getId())); | 51 | return $this->redirectToRoute('user_edit', ['id' => $user->getId()]); |
52 | } | 52 | } |
53 | 53 | ||
54 | return $this->render('WallabagUserBundle:Manage:new.html.twig', array( | 54 | return $this->render('WallabagUserBundle:Manage:new.html.twig', [ |
55 | 'user' => $user, | 55 | 'user' => $user, |
56 | 'form' => $form->createView(), | 56 | 'form' => $form->createView(), |
57 | )); | 57 | ]); |
58 | } | 58 | } |
59 | 59 | ||
60 | /** | 60 | /** |
@@ -79,15 +79,15 @@ class ManageController extends Controller | |||
79 | $this->get('translator')->trans('flashes.user.notice.updated', ['%username%' => $user->getUsername()]) | 79 | $this->get('translator')->trans('flashes.user.notice.updated', ['%username%' => $user->getUsername()]) |
80 | ); | 80 | ); |
81 | 81 | ||
82 | return $this->redirectToRoute('user_edit', array('id' => $user->getId())); | 82 | return $this->redirectToRoute('user_edit', ['id' => $user->getId()]); |
83 | } | 83 | } |
84 | 84 | ||
85 | return $this->render('WallabagUserBundle:Manage:edit.html.twig', array( | 85 | return $this->render('WallabagUserBundle:Manage:edit.html.twig', [ |
86 | 'user' => $user, | 86 | 'user' => $user, |
87 | 'edit_form' => $editForm->createView(), | 87 | 'edit_form' => $editForm->createView(), |
88 | 'delete_form' => $deleteForm->createView(), | 88 | 'delete_form' => $deleteForm->createView(), |
89 | 'twofactor_auth' => $this->getParameter('twofactor_auth'), | 89 | 'twofactor_auth' => $this->getParameter('twofactor_auth'), |
90 | )); | 90 | ]); |
91 | } | 91 | } |
92 | 92 | ||
93 | /** | 93 | /** |
@@ -116,22 +116,6 @@ class ManageController extends Controller | |||
116 | } | 116 | } |
117 | 117 | ||
118 | /** | 118 | /** |
119 | * Creates a form to delete a User entity. | ||
120 | * | ||
121 | * @param User $user The User entity | ||
122 | * | ||
123 | * @return \Symfony\Component\Form\Form The form | ||
124 | */ | ||
125 | private function createDeleteForm(User $user) | ||
126 | { | ||
127 | return $this->createFormBuilder() | ||
128 | ->setAction($this->generateUrl('user_delete', array('id' => $user->getId()))) | ||
129 | ->setMethod('DELETE') | ||
130 | ->getForm() | ||
131 | ; | ||
132 | } | ||
133 | |||
134 | /** | ||
135 | * @param Request $request | 119 | * @param Request $request |
136 | * @param int $page | 120 | * @param int $page |
137 | * | 121 | * |
@@ -175,4 +159,20 @@ class ManageController extends Controller | |||
175 | 'users' => $pagerFanta, | 159 | 'users' => $pagerFanta, |
176 | ]); | 160 | ]); |
177 | } | 161 | } |
162 | |||
163 | /** | ||
164 | * Creates a form to delete a User entity. | ||
165 | * | ||
166 | * @param User $user The User entity | ||
167 | * | ||
168 | * @return \Symfony\Component\Form\Form The form | ||
169 | */ | ||
170 | private function createDeleteForm(User $user) | ||
171 | { | ||
172 | return $this->createFormBuilder() | ||
173 | ->setAction($this->generateUrl('user_delete', ['id' => $user->getId()])) | ||
174 | ->setMethod('DELETE') | ||
175 | ->getForm() | ||
176 | ; | ||
177 | } | ||
178 | } | 178 | } |