Skip to content

Commit 8fd068a

Browse files
committed
Upgrade to php-cs-fixer v3
1 parent 69cb175 commit 8fd068a

File tree

6 files changed

+39
-39
lines changed

6 files changed

+39
-39
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.php-cs-fixer.php
2-
.php_cs.cache
2+
.php-cs-fixer.cache
33
composer.lock
44
phpunit.xml
55
vendor/

FOSUserEvents.php

+33-33
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ final class FOSUserEvents
2323
*
2424
* @Event("FOS\UserBundle\Event\GetResponseUserEvent")
2525
*/
26-
const CHANGE_PASSWORD_INITIALIZE = 'fos_user.change_password.edit.initialize';
26+
public const CHANGE_PASSWORD_INITIALIZE = 'fos_user.change_password.edit.initialize';
2727

2828
/**
2929
* The CHANGE_PASSWORD_SUCCESS event occurs when the change password form is submitted successfully.
@@ -32,7 +32,7 @@ final class FOSUserEvents
3232
*
3333
* @Event("FOS\UserBundle\Event\FormEvent")
3434
*/
35-
const CHANGE_PASSWORD_SUCCESS = 'fos_user.change_password.edit.success';
35+
public const CHANGE_PASSWORD_SUCCESS = 'fos_user.change_password.edit.success';
3636

3737
/**
3838
* The CHANGE_PASSWORD_COMPLETED event occurs after saving the user in the change password process.
@@ -41,7 +41,7 @@ final class FOSUserEvents
4141
*
4242
* @Event("FOS\UserBundle\Event\FilterUserResponseEvent")
4343
*/
44-
const CHANGE_PASSWORD_COMPLETED = 'fos_user.change_password.edit.completed';
44+
public const CHANGE_PASSWORD_COMPLETED = 'fos_user.change_password.edit.completed';
4545

4646
/**
4747
* The GROUP_CREATE_INITIALIZE event occurs when the group creation process is initialized.
@@ -50,7 +50,7 @@ final class FOSUserEvents
5050
*
5151
* @Event("FOS\UserBundle\Event\GroupEvent")
5252
*/
53-
const GROUP_CREATE_INITIALIZE = 'fos_user.group.create.initialize';
53+
public const GROUP_CREATE_INITIALIZE = 'fos_user.group.create.initialize';
5454

5555
/**
5656
* The GROUP_CREATE_SUCCESS event occurs when the group creation form is submitted successfully.
@@ -59,7 +59,7 @@ final class FOSUserEvents
5959
*
6060
* @Event("FOS\UserBundle\Event\FormEvent")
6161
*/
62-
const GROUP_CREATE_SUCCESS = 'fos_user.group.create.success';
62+
public const GROUP_CREATE_SUCCESS = 'fos_user.group.create.success';
6363

6464
/**
6565
* The GROUP_CREATE_COMPLETED event occurs after saving the group in the group creation process.
@@ -68,7 +68,7 @@ final class FOSUserEvents
6868
*
6969
* @Event("FOS\UserBundle\Event\FilterGroupResponseEvent")
7070
*/
71-
const GROUP_CREATE_COMPLETED = 'fos_user.group.create.completed';
71+
public const GROUP_CREATE_COMPLETED = 'fos_user.group.create.completed';
7272

7373
/**
7474
* The GROUP_DELETE_COMPLETED event occurs after deleting the group.
@@ -77,7 +77,7 @@ final class FOSUserEvents
7777
*
7878
* @Event("FOS\UserBundle\Event\FilterGroupResponseEvent")
7979
*/
80-
const GROUP_DELETE_COMPLETED = 'fos_user.group.delete.completed';
80+
public const GROUP_DELETE_COMPLETED = 'fos_user.group.delete.completed';
8181

8282
/**
8383
* The GROUP_EDIT_INITIALIZE event occurs when the group editing process is initialized.
@@ -86,7 +86,7 @@ final class FOSUserEvents
8686
*
8787
* @Event("FOS\UserBundle\Event\GetResponseGroupEvent")
8888
*/
89-
const GROUP_EDIT_INITIALIZE = 'fos_user.group.edit.initialize';
89+
public const GROUP_EDIT_INITIALIZE = 'fos_user.group.edit.initialize';
9090

9191
/**
9292
* The GROUP_EDIT_SUCCESS event occurs when the group edit form is submitted successfully.
@@ -95,7 +95,7 @@ final class FOSUserEvents
9595
*
9696
* @Event("FOS\UserBundle\Event\FormEvent")
9797
*/
98-
const GROUP_EDIT_SUCCESS = 'fos_user.group.edit.success';
98+
public const GROUP_EDIT_SUCCESS = 'fos_user.group.edit.success';
9999

100100
/**
101101
* The GROUP_EDIT_COMPLETED event occurs after saving the group in the group edit process.
@@ -104,7 +104,7 @@ final class FOSUserEvents
104104
*
105105
* @Event("FOS\UserBundle\Event\FilterGroupResponseEvent")
106106
*/
107-
const GROUP_EDIT_COMPLETED = 'fos_user.group.edit.completed';
107+
public const GROUP_EDIT_COMPLETED = 'fos_user.group.edit.completed';
108108

109109
/**
110110
* The PROFILE_EDIT_INITIALIZE event occurs when the profile editing process is initialized.
@@ -113,7 +113,7 @@ final class FOSUserEvents
113113
*
114114
* @Event("FOS\UserBundle\Event\GetResponseUserEvent")
115115
*/
116-
const PROFILE_EDIT_INITIALIZE = 'fos_user.profile.edit.initialize';
116+
public const PROFILE_EDIT_INITIALIZE = 'fos_user.profile.edit.initialize';
117117

118118
/**
119119
* The PROFILE_EDIT_SUCCESS event occurs when the profile edit form is submitted successfully.
@@ -122,7 +122,7 @@ final class FOSUserEvents
122122
*
123123
* @Event("FOS\UserBundle\Event\FormEvent")
124124
*/
125-
const PROFILE_EDIT_SUCCESS = 'fos_user.profile.edit.success';
125+
public const PROFILE_EDIT_SUCCESS = 'fos_user.profile.edit.success';
126126

127127
/**
128128
* The PROFILE_EDIT_COMPLETED event occurs after saving the user in the profile edit process.
@@ -131,7 +131,7 @@ final class FOSUserEvents
131131
*
132132
* @Event("FOS\UserBundle\Event\FilterUserResponseEvent")
133133
*/
134-
const PROFILE_EDIT_COMPLETED = 'fos_user.profile.edit.completed';
134+
public const PROFILE_EDIT_COMPLETED = 'fos_user.profile.edit.completed';
135135

136136
/**
137137
* The REGISTRATION_INITIALIZE event occurs when the registration process is initialized.
@@ -140,7 +140,7 @@ final class FOSUserEvents
140140
*
141141
* @Event("FOS\UserBundle\Event\UserEvent")
142142
*/
143-
const REGISTRATION_INITIALIZE = 'fos_user.registration.initialize';
143+
public const REGISTRATION_INITIALIZE = 'fos_user.registration.initialize';
144144

145145
/**
146146
* The REGISTRATION_SUCCESS event occurs when the registration form is submitted successfully.
@@ -149,7 +149,7 @@ final class FOSUserEvents
149149
*
150150
* @Event("FOS\UserBundle\Event\FormEvent")
151151
*/
152-
const REGISTRATION_SUCCESS = 'fos_user.registration.success';
152+
public const REGISTRATION_SUCCESS = 'fos_user.registration.success';
153153

154154
/**
155155
* The REGISTRATION_FAILURE event occurs when the registration form is not valid.
@@ -159,7 +159,7 @@ final class FOSUserEvents
159159
*
160160
* @Event("FOS\UserBundle\Event\FormEvent")
161161
*/
162-
const REGISTRATION_FAILURE = 'fos_user.registration.failure';
162+
public const REGISTRATION_FAILURE = 'fos_user.registration.failure';
163163

164164
/**
165165
* The REGISTRATION_COMPLETED event occurs after saving the user in the registration process.
@@ -168,7 +168,7 @@ final class FOSUserEvents
168168
*
169169
* @Event("FOS\UserBundle\Event\FilterUserResponseEvent")
170170
*/
171-
const REGISTRATION_COMPLETED = 'fos_user.registration.completed';
171+
public const REGISTRATION_COMPLETED = 'fos_user.registration.completed';
172172

173173
/**
174174
* The REGISTRATION_CONFIRM event occurs just before confirming the account.
@@ -177,7 +177,7 @@ final class FOSUserEvents
177177
*
178178
* @Event("FOS\UserBundle\Event\GetResponseUserEvent")
179179
*/
180-
const REGISTRATION_CONFIRM = 'fos_user.registration.confirm';
180+
public const REGISTRATION_CONFIRM = 'fos_user.registration.confirm';
181181

182182
/**
183183
* The REGISTRATION_CONFIRMED event occurs after confirming the account.
@@ -186,7 +186,7 @@ final class FOSUserEvents
186186
*
187187
* @Event("FOS\UserBundle\Event\FilterUserResponseEvent")
188188
*/
189-
const REGISTRATION_CONFIRMED = 'fos_user.registration.confirmed';
189+
public const REGISTRATION_CONFIRMED = 'fos_user.registration.confirmed';
190190

191191
/**
192192
* The RESETTING_RESET_REQUEST event occurs when a user requests a password reset of the account.
@@ -196,7 +196,7 @@ final class FOSUserEvents
196196
*
197197
* @Event("FOS\UserBundle\Event\GetResponseUserEvent")
198198
*/
199-
const RESETTING_RESET_REQUEST = 'fos_user.resetting.reset.request';
199+
public const RESETTING_RESET_REQUEST = 'fos_user.resetting.reset.request';
200200

201201
/**
202202
* The RESETTING_RESET_INITIALIZE event occurs when the resetting process is initialized.
@@ -205,7 +205,7 @@ final class FOSUserEvents
205205
*
206206
* @Event("FOS\UserBundle\Event\GetResponseUserEvent")
207207
*/
208-
const RESETTING_RESET_INITIALIZE = 'fos_user.resetting.reset.initialize';
208+
public const RESETTING_RESET_INITIALIZE = 'fos_user.resetting.reset.initialize';
209209

210210
/**
211211
* The RESETTING_RESET_SUCCESS event occurs when the resetting form is submitted successfully.
@@ -214,7 +214,7 @@ final class FOSUserEvents
214214
*
215215
* @Event("FOS\UserBundle\Event\FormEvent ")
216216
*/
217-
const RESETTING_RESET_SUCCESS = 'fos_user.resetting.reset.success';
217+
public const RESETTING_RESET_SUCCESS = 'fos_user.resetting.reset.success';
218218

219219
/**
220220
* The RESETTING_RESET_COMPLETED event occurs after saving the user in the resetting process.
@@ -223,7 +223,7 @@ final class FOSUserEvents
223223
*
224224
* @Event("FOS\UserBundle\Event\FilterUserResponseEvent")
225225
*/
226-
const RESETTING_RESET_COMPLETED = 'fos_user.resetting.reset.completed';
226+
public const RESETTING_RESET_COMPLETED = 'fos_user.resetting.reset.completed';
227227

228228
/**
229229
* The SECURITY_IMPLICIT_LOGIN event occurs when the user is logged in programmatically.
@@ -232,7 +232,7 @@ final class FOSUserEvents
232232
*
233233
* @Event("FOS\UserBundle\Event\UserEvent")
234234
*/
235-
const SECURITY_IMPLICIT_LOGIN = 'fos_user.security.implicit_login';
235+
public const SECURITY_IMPLICIT_LOGIN = 'fos_user.security.implicit_login';
236236

237237
/**
238238
* The RESETTING_SEND_EMAIL_INITIALIZE event occurs when the send email process is initialized.
@@ -242,7 +242,7 @@ final class FOSUserEvents
242242
*
243243
* @Event("FOS\UserBundle\Event\GetResponseNullableUserEvent")
244244
*/
245-
const RESETTING_SEND_EMAIL_INITIALIZE = 'fos_user.resetting.send_email.initialize';
245+
public const RESETTING_SEND_EMAIL_INITIALIZE = 'fos_user.resetting.send_email.initialize';
246246

247247
/**
248248
* The RESETTING_SEND_EMAIL_CONFIRM event occurs when all prerequisites to send email are
@@ -253,7 +253,7 @@ final class FOSUserEvents
253253
*
254254
* @Event("FOS\UserBundle\Event\GetResponseUserEvent")
255255
*/
256-
const RESETTING_SEND_EMAIL_CONFIRM = 'fos_user.resetting.send_email.confirm';
256+
public const RESETTING_SEND_EMAIL_CONFIRM = 'fos_user.resetting.send_email.confirm';
257257

258258
/**
259259
* The RESETTING_SEND_EMAIL_COMPLETED event occurs after the email is sent.
@@ -263,7 +263,7 @@ final class FOSUserEvents
263263
*
264264
* @Event("FOS\UserBundle\Event\GetResponseUserEvent")
265265
*/
266-
const RESETTING_SEND_EMAIL_COMPLETED = 'fos_user.resetting.send_email.completed';
266+
public const RESETTING_SEND_EMAIL_COMPLETED = 'fos_user.resetting.send_email.completed';
267267

268268
/**
269269
* The USER_CREATED event occurs when the user is created with UserManipulator.
@@ -272,7 +272,7 @@ final class FOSUserEvents
272272
*
273273
* @Event("FOS\UserBundle\Event\UserEvent")
274274
*/
275-
const USER_CREATED = 'fos_user.user.created';
275+
public const USER_CREATED = 'fos_user.user.created';
276276

277277
/**
278278
* The USER_PASSWORD_CHANGED event occurs when the user is created with UserManipulator.
@@ -281,7 +281,7 @@ final class FOSUserEvents
281281
*
282282
* @Event("FOS\UserBundle\Event\UserEvent")
283283
*/
284-
const USER_PASSWORD_CHANGED = 'fos_user.user.password_changed';
284+
public const USER_PASSWORD_CHANGED = 'fos_user.user.password_changed';
285285

286286
/**
287287
* The USER_ACTIVATED event occurs when the user is created with UserManipulator.
@@ -290,7 +290,7 @@ final class FOSUserEvents
290290
*
291291
* @Event("FOS\UserBundle\Event\UserEvent")
292292
*/
293-
const USER_ACTIVATED = 'fos_user.user.activated';
293+
public const USER_ACTIVATED = 'fos_user.user.activated';
294294

295295
/**
296296
* The USER_DEACTIVATED event occurs when the user is created with UserManipulator.
@@ -299,7 +299,7 @@ final class FOSUserEvents
299299
*
300300
* @Event("FOS\UserBundle\Event\UserEvent")
301301
*/
302-
const USER_DEACTIVATED = 'fos_user.user.deactivated';
302+
public const USER_DEACTIVATED = 'fos_user.user.deactivated';
303303

304304
/**
305305
* The USER_PROMOTED event occurs when the user is created with UserManipulator.
@@ -308,7 +308,7 @@ final class FOSUserEvents
308308
*
309309
* @Event("FOS\UserBundle\Event\UserEvent")
310310
*/
311-
const USER_PROMOTED = 'fos_user.user.promoted';
311+
public const USER_PROMOTED = 'fos_user.user.promoted';
312312

313313
/**
314314
* The USER_DEMOTED event occurs when the user is created with UserManipulator.
@@ -317,5 +317,5 @@ final class FOSUserEvents
317317
*
318318
* @Event("FOS\UserBundle\Event\UserEvent")
319319
*/
320-
const USER_DEMOTED = 'fos_user.user.demoted';
320+
public const USER_DEMOTED = 'fos_user.user.demoted';
321321
}

Model/UserInterface.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
*/
2020
interface FosUserInterface extends \Serializable
2121
{
22-
const ROLE_DEFAULT = 'ROLE_USER';
22+
public const ROLE_DEFAULT = 'ROLE_USER';
2323

24-
const ROLE_SUPER_ADMIN = 'ROLE_SUPER_ADMIN';
24+
public const ROLE_SUPER_ADMIN = 'ROLE_SUPER_ADMIN';
2525

2626
/**
2727
* Returns the user unique id.

Tests/Doctrine/UserManagerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
class UserManagerTest extends TestCase
1919
{
20-
const USER_CLASS = 'FOS\UserBundle\Tests\Doctrine\DummyUser';
20+
public const USER_CLASS = 'FOS\UserBundle\Tests\Doctrine\DummyUser';
2121

2222
/** @var UserManager */
2323
protected $userManager;

Tests/EventListener/AuthenticationListenerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
class AuthenticationListenerTest extends TestCase
2121
{
22-
const FIREWALL_NAME = 'foo';
22+
public const FIREWALL_NAME = 'foo';
2323

2424
/** @var EventDispatcherInterface */
2525
private $eventDispatcher;

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"require-dev": {
4141
"doctrine/doctrine-bundle": "^1.3",
42-
"friendsofphp/php-cs-fixer": "^2.2",
42+
"friendsofphp/php-cs-fixer": "^3.0.2",
4343
"swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0",
4444
"symfony/console": "^4.4",
4545
"symfony/phpunit-bridge": "^5.3",

0 commit comments

Comments
 (0)