Skip to content

Commit 3c96335

Browse files
stofstof
committed
Remove useless local variables
1 parent 858cc24 commit 3c96335

10 files changed

+38
-76
lines changed

‎Command/ActivateUserCommand.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
6060
{
6161
$username = $input->getArgument('username');
6262

63-
$manipulator = $this->userManipulator;
64-
$manipulator->activate($username);
63+
$this->userManipulator->activate($username);
6564

6665
$output->writeln(sprintf('User "%s" has been activated.', $username));
6766
}

‎Command/ChangePasswordCommand.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
6666
$username = $input->getArgument('username');
6767
$password = $input->getArgument('password');
6868

69-
$manipulator = $this->userManipulator;
70-
$manipulator->changePassword($username, $password);
69+
$this->userManipulator->changePassword($username, $password);
7170

7271
$output->writeln(sprintf('Changed password for user <comment>%s</comment>', $username));
7372
}

‎Command/CreateUserCommand.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
8686
$inactive = $input->getOption('inactive');
8787
$superadmin = $input->getOption('super-admin');
8888

89-
$manipulator = $this->userManipulator;
90-
$manipulator->create($username, $password, $email, !$inactive, $superadmin);
89+
$this->userManipulator->create($username, $password, $email, !$inactive, $superadmin);
9190

9291
$output->writeln(sprintf('Created user <comment>%s</comment>', $username));
9392
}

‎Command/DeactivateUserCommand.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
6060
{
6161
$username = $input->getArgument('username');
6262

63-
$manipulator = $this->userManipulator;
64-
$manipulator->deactivate($username);
63+
$this->userManipulator->deactivate($username);
6564

6665
$output->writeln(sprintf('User "%s" has been deactivated.', $username));
6766
}

‎Controller/ChangePasswordController.php

+3-5
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ public function changePasswordAction(Request $request)
5858
throw new AccessDeniedException('This user does not have access to this section.');
5959
}
6060

61-
$dispatcher = $this->eventDispatcher;
62-
6361
$event = new GetResponseUserEvent($user, $request);
64-
$dispatcher->dispatch(FOSUserEvents::CHANGE_PASSWORD_INITIALIZE, $event);
62+
$this->eventDispatcher->dispatch(FOSUserEvents::CHANGE_PASSWORD_INITIALIZE, $event);
6563

6664
if (null !== $event->getResponse()) {
6765
return $event->getResponse();
@@ -74,7 +72,7 @@ public function changePasswordAction(Request $request)
7472

7573
if ($form->isSubmitted() && $form->isValid()) {
7674
$event = new FormEvent($form, $request);
77-
$dispatcher->dispatch(FOSUserEvents::CHANGE_PASSWORD_SUCCESS, $event);
75+
$this->eventDispatcher->dispatch(FOSUserEvents::CHANGE_PASSWORD_SUCCESS, $event);
7876

7977
$this->userManager->updateUser($user);
8078

@@ -83,7 +81,7 @@ public function changePasswordAction(Request $request)
8381
$response = new RedirectResponse($url);
8482
}
8583

86-
$dispatcher->dispatch(FOSUserEvents::CHANGE_PASSWORD_COMPLETED, new FilterUserResponseEvent($user, $request, $response));
84+
$this->eventDispatcher->dispatch(FOSUserEvents::CHANGE_PASSWORD_COMPLETED, new FilterUserResponseEvent($user, $request, $response));
8785

8886
return $response;
8987
}

‎Controller/ConfirmEmailUpdateController.php

-14
Original file line numberDiff line numberDiff line change
@@ -34,23 +34,9 @@ class ConfirmEmailUpdateController extends Controller
3434
private $eventDispatcher;
3535
private $userManager;
3636
private $emailUpdateConfirmation;
37-
38-
/**
39-
* @var TranslatorInterface
40-
*/
4137
private $translator;
42-
/**
43-
* @var CanonicalFieldsUpdater
44-
*/
4538
private $canonicalFieldsUpdater;
4639

47-
/**
48-
* @param EventDispatcherInterface $eventDispatcher
49-
* @param UserManagerInterface $userManager
50-
* @param EmailUpdateConfirmation $emailUpdateConfirmation
51-
* @param TranslatorInterface $translator
52-
* @param CanonicalFieldsUpdater $canonicalFieldsUpdater
53-
*/
5440
public function __construct(EventDispatcherInterface $eventDispatcher, UserManagerInterface $userManager, EmailUpdateConfirmation $emailUpdateConfirmation, TranslatorInterface $translator, CanonicalFieldsUpdater $canonicalFieldsUpdater)
5541
{
5642
$this->eventDispatcher = $eventDispatcher;

‎Controller/GroupController.php

+8-13
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,8 @@ public function editAction(Request $request, $groupName)
8181
{
8282
$group = $this->findGroupBy('name', $groupName);
8383

84-
$dispatcher = $this->eventDispatcher;
85-
8684
$event = new GetResponseGroupEvent($group, $request);
87-
$dispatcher->dispatch(FOSUserEvents::GROUP_EDIT_INITIALIZE, $event);
85+
$this->eventDispatcher->dispatch(FOSUserEvents::GROUP_EDIT_INITIALIZE, $event);
8886

8987
if (null !== $event->getResponse()) {
9088
return $event->getResponse();
@@ -97,7 +95,7 @@ public function editAction(Request $request, $groupName)
9795

9896
if ($form->isSubmitted() && $form->isValid()) {
9997
$event = new FormEvent($form, $request);
100-
$dispatcher->dispatch(FOSUserEvents::GROUP_EDIT_SUCCESS, $event);
98+
$this->eventDispatcher->dispatch(FOSUserEvents::GROUP_EDIT_SUCCESS, $event);
10199

102100
$this->groupManager->updateGroup($group);
103101

@@ -106,7 +104,7 @@ public function editAction(Request $request, $groupName)
106104
$response = new RedirectResponse($url);
107105
}
108106

109-
$dispatcher->dispatch(FOSUserEvents::GROUP_EDIT_COMPLETED, new FilterGroupResponseEvent($group, $request, $response));
107+
$this->eventDispatcher->dispatch(FOSUserEvents::GROUP_EDIT_COMPLETED, new FilterGroupResponseEvent($group, $request, $response));
110108

111109
return $response;
112110
}
@@ -126,12 +124,9 @@ public function editAction(Request $request, $groupName)
126124
*/
127125
public function newAction(Request $request)
128126
{
129-
$groupManager = $this->groupManager;
130-
$dispatcher = $this->eventDispatcher;
131-
132-
$group = $groupManager->createGroup('');
127+
$group = $this->groupManager->createGroup('');
133128

134-
$dispatcher->dispatch(FOSUserEvents::GROUP_CREATE_INITIALIZE, new GroupEvent($group, $request));
129+
$this->eventDispatcher->dispatch(FOSUserEvents::GROUP_CREATE_INITIALIZE, new GroupEvent($group, $request));
135130

136131
$form = $this->formFactory->createForm();
137132
$form->setData($group);
@@ -140,16 +135,16 @@ public function newAction(Request $request)
140135

141136
if ($form->isSubmitted() && $form->isValid()) {
142137
$event = new FormEvent($form, $request);
143-
$dispatcher->dispatch(FOSUserEvents::GROUP_CREATE_SUCCESS, $event);
138+
$this->eventDispatcher->dispatch(FOSUserEvents::GROUP_CREATE_SUCCESS, $event);
144139

145-
$groupManager->updateGroup($group);
140+
$this->groupManager->updateGroup($group);
146141

147142
if (null === $response = $event->getResponse()) {
148143
$url = $this->generateUrl('fos_user_group_show', array('groupName' => $group->getName()));
149144
$response = new RedirectResponse($url);
150145
}
151146

152-
$dispatcher->dispatch(FOSUserEvents::GROUP_CREATE_COMPLETED, new FilterGroupResponseEvent($group, $request, $response));
147+
$this->eventDispatcher->dispatch(FOSUserEvents::GROUP_CREATE_COMPLETED, new FilterGroupResponseEvent($group, $request, $response));
153148

154149
return $response;
155150
}

‎Controller/ProfileController.php

+3-5
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,8 @@ public function editAction(Request $request)
7272
throw new AccessDeniedException('This user does not have access to this section.');
7373
}
7474

75-
$dispatcher = $this->eventDispatcher;
76-
7775
$event = new GetResponseUserEvent($user, $request);
78-
$dispatcher->dispatch(FOSUserEvents::PROFILE_EDIT_INITIALIZE, $event);
76+
$this->eventDispatcher->dispatch(FOSUserEvents::PROFILE_EDIT_INITIALIZE, $event);
7977

8078
if (null !== $event->getResponse()) {
8179
return $event->getResponse();
@@ -88,7 +86,7 @@ public function editAction(Request $request)
8886

8987
if ($form->isSubmitted() && $form->isValid()) {
9088
$event = new FormEvent($form, $request);
91-
$dispatcher->dispatch(FOSUserEvents::PROFILE_EDIT_SUCCESS, $event);
89+
$this->eventDispatcher->dispatch(FOSUserEvents::PROFILE_EDIT_SUCCESS, $event);
9290

9391
$this->userManager->updateUser($user);
9492

@@ -97,7 +95,7 @@ public function editAction(Request $request)
9795
$response = new RedirectResponse($url);
9896
}
9997

100-
$dispatcher->dispatch(FOSUserEvents::PROFILE_EDIT_COMPLETED, new FilterUserResponseEvent($user, $request, $response));
98+
$this->eventDispatcher->dispatch(FOSUserEvents::PROFILE_EDIT_COMPLETED, new FilterUserResponseEvent($user, $request, $response));
10199

102100
return $response;
103101
}

‎Controller/RegistrationController.php

+11-14
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,11 @@ public function __construct(EventDispatcherInterface $eventDispatcher, FactoryIn
5656
*/
5757
public function registerAction(Request $request)
5858
{
59-
$userManager = $this->userManager;
60-
$dispatcher = $this->eventDispatcher;
61-
62-
$user = $userManager->createUser();
59+
$user = $this->userManager->createUser();
6360
$user->setEnabled(true);
6461

6562
$event = new GetResponseUserEvent($user, $request);
66-
$dispatcher->dispatch(FOSUserEvents::REGISTRATION_INITIALIZE, $event);
63+
$this->eventDispatcher->dispatch(FOSUserEvents::REGISTRATION_INITIALIZE, $event);
6764

6865
if (null !== $event->getResponse()) {
6966
return $event->getResponse();
@@ -77,22 +74,22 @@ public function registerAction(Request $request)
7774
if ($form->isSubmitted()) {
7875
if ($form->isValid()) {
7976
$event = new FormEvent($form, $request);
80-
$dispatcher->dispatch(FOSUserEvents::REGISTRATION_SUCCESS, $event);
77+
$this->eventDispatcher->dispatch(FOSUserEvents::REGISTRATION_SUCCESS, $event);
8178

82-
$userManager->updateUser($user);
79+
$this->userManager->updateUser($user);
8380

8481
if (null === $response = $event->getResponse()) {
8582
$url = $this->generateUrl('fos_user_registration_confirmed');
8683
$response = new RedirectResponse($url);
8784
}
8885

89-
$dispatcher->dispatch(FOSUserEvents::REGISTRATION_COMPLETED, new FilterUserResponseEvent($user, $request, $response));
86+
$this->eventDispatcher->dispatch(FOSUserEvents::REGISTRATION_COMPLETED, new FilterUserResponseEvent($user, $request, $response));
9087

9188
return $response;
9289
}
9390

9491
$event = new FormEvent($form, $request);
95-
$dispatcher->dispatch(FOSUserEvents::REGISTRATION_FAILURE, $event);
92+
$this->eventDispatcher->dispatch(FOSUserEvents::REGISTRATION_FAILURE, $event);
9693

9794
if (null !== $response = $event->getResponse()) {
9895
return $response;
@@ -145,13 +142,11 @@ public function confirmAction(Request $request, $token)
145142
throw new NotFoundHttpException(sprintf('The user with confirmation token "%s" does not exist', $token));
146143
}
147144

148-
$dispatcher = $this->eventDispatcher;
149-
150145
$user->setConfirmationToken(null);
151146
$user->setEnabled(true);
152147

153148
$event = new GetResponseUserEvent($user, $request);
154-
$dispatcher->dispatch(FOSUserEvents::REGISTRATION_CONFIRM, $event);
149+
$this->eventDispatcher->dispatch(FOSUserEvents::REGISTRATION_CONFIRM, $event);
155150

156151
$userManager->updateUser($user);
157152

@@ -160,7 +155,7 @@ public function confirmAction(Request $request, $token)
160155
$response = new RedirectResponse($url);
161156
}
162157

163-
$dispatcher->dispatch(FOSUserEvents::REGISTRATION_CONFIRMED, new FilterUserResponseEvent($user, $request, $response));
158+
$this->eventDispatcher->dispatch(FOSUserEvents::REGISTRATION_CONFIRMED, new FilterUserResponseEvent($user, $request, $response));
164159

165160
return $response;
166161
}
@@ -182,7 +177,7 @@ public function confirmedAction(Request $request)
182177
}
183178

184179
/**
185-
* @return mixed
180+
* @return string|null
186181
*/
187182
private function getTargetUrlFromSession(SessionInterface $session)
188183
{
@@ -191,5 +186,7 @@ private function getTargetUrlFromSession(SessionInterface $session)
191186
if ($session->has($key)) {
192187
return $session->get($key);
193188
}
189+
190+
return null;
194191
}
195192
}

‎Controller/ResettingController.php

+9-17
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,18 @@ public function sendEmailAction(Request $request)
8383
{
8484
$username = $request->request->get('username');
8585

86-
/** @var $user UserInterface */
8786
$user = $this->userManager->findUserByUsernameOrEmail($username);
88-
$dispatcher = $this->eventDispatcher;
8987

90-
/* Dispatch init event */
9188
$event = new GetResponseNullableUserEvent($user, $request);
92-
$dispatcher->dispatch(FOSUserEvents::RESETTING_SEND_EMAIL_INITIALIZE, $event);
89+
$this->eventDispatcher->dispatch(FOSUserEvents::RESETTING_SEND_EMAIL_INITIALIZE, $event);
9390

9491
if (null !== $event->getResponse()) {
9592
return $event->getResponse();
9693
}
9794

9895
if (null !== $user && !$user->isPasswordRequestNonExpired($this->retryTtl)) {
9996
$event = new GetResponseUserEvent($user, $request);
100-
$dispatcher->dispatch(FOSUserEvents::RESETTING_RESET_REQUEST, $event);
97+
$this->eventDispatcher->dispatch(FOSUserEvents::RESETTING_RESET_REQUEST, $event);
10198

10299
if (null !== $event->getResponse()) {
103100
return $event->getResponse();
@@ -107,9 +104,8 @@ public function sendEmailAction(Request $request)
107104
$user->setConfirmationToken($this->tokenGenerator->generateToken());
108105
}
109106

110-
/* Dispatch confirm event */
111107
$event = new GetResponseUserEvent($user, $request);
112-
$dispatcher->dispatch(FOSUserEvents::RESETTING_SEND_EMAIL_CONFIRM, $event);
108+
$this->eventDispatcher->dispatch(FOSUserEvents::RESETTING_SEND_EMAIL_CONFIRM, $event);
113109

114110
if (null !== $event->getResponse()) {
115111
return $event->getResponse();
@@ -119,9 +115,8 @@ public function sendEmailAction(Request $request)
119115
$user->setPasswordRequestedAt(new \DateTime());
120116
$this->userManager->updateUser($user);
121117

122-
/* Dispatch completed event */
123118
$event = new GetResponseUserEvent($user, $request);
124-
$dispatcher->dispatch(FOSUserEvents::RESETTING_SEND_EMAIL_COMPLETED, $event);
119+
$this->eventDispatcher->dispatch(FOSUserEvents::RESETTING_SEND_EMAIL_COMPLETED, $event);
125120

126121
if (null !== $event->getResponse()) {
127122
return $event->getResponse();
@@ -162,17 +157,14 @@ public function checkEmailAction(Request $request)
162157
*/
163158
public function resetAction(Request $request, $token)
164159
{
165-
$userManager = $this->userManager;
166-
$dispatcher = $this->eventDispatcher;
167-
168-
$user = $userManager->findUserByConfirmationToken($token);
160+
$user = $this->userManager->findUserByConfirmationToken($token);
169161

170162
if (null === $user) {
171163
return new RedirectResponse($this->container->get('router')->generate('fos_user_security_login'));
172164
}
173165

174166
$event = new GetResponseUserEvent($user, $request);
175-
$dispatcher->dispatch(FOSUserEvents::RESETTING_RESET_INITIALIZE, $event);
167+
$this->eventDispatcher->dispatch(FOSUserEvents::RESETTING_RESET_INITIALIZE, $event);
176168

177169
if (null !== $event->getResponse()) {
178170
return $event->getResponse();
@@ -185,16 +177,16 @@ public function resetAction(Request $request, $token)
185177

186178
if ($form->isSubmitted() && $form->isValid()) {
187179
$event = new FormEvent($form, $request);
188-
$dispatcher->dispatch(FOSUserEvents::RESETTING_RESET_SUCCESS, $event);
180+
$this->eventDispatcher->dispatch(FOSUserEvents::RESETTING_RESET_SUCCESS, $event);
189181

190-
$userManager->updateUser($user);
182+
$this->userManager->updateUser($user);
191183

192184
if (null === $response = $event->getResponse()) {
193185
$url = $this->generateUrl('fos_user_profile_show');
194186
$response = new RedirectResponse($url);
195187
}
196188

197-
$dispatcher->dispatch(
189+
$this->eventDispatcher->dispatch(
198190
FOSUserEvents::RESETTING_RESET_COMPLETED,
199191
new FilterUserResponseEvent($user, $request, $response)
200192
);

0 commit comments

Comments
 (0)