Skip to content

Commit cb27a67

Browse files
stofstof
authoredFeb 16, 2018
Merge pull request #2731 from stof/revert_update_email_confirmation
Revert the email update confirmation feature
·
v4.0.0v2.1.0
2 parents 93ef16d + 8bb8789 commit cb27a67

33 files changed

+5
-1177
lines changed
 

Diff for: ‎Changelog.md

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Changelog
66
* Add Symfony 4 compatibility.
77
* Redirect to login when requesting resetting password with invalid token.
88
* Added autocomplete hints for password inputs.
9-
* Added email update confirmation option.
109
* Fixed several incorrect Turkish translations.
1110

1211
### 2.0.2 (2017-11-29)

Diff for: ‎Controller/ConfirmEmailUpdateController.php

-90
This file was deleted.

Diff for: ‎DependencyInjection/Configuration.php

-8
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,6 @@ private function addProfileSection(ArrayNodeDefinition $node)
109109
->end()
110110
->end()
111111
->end()
112-
->arrayNode('email_update_confirmation')
113-
->addDefaultsIfNotSet()
114-
->children()
115-
->booleanNode('enabled')->defaultFalse()->end()
116-
->scalarNode('cypher_method')->defaultNull()->end()
117-
->scalarNode('email_template')->defaultValue('@FOSUser/Profile/email_update_confirmation.txt.twig')->end()
118-
->end()
119-
->end()
120112
->end()
121113
->end()
122114
->end();

Diff for: ‎DependencyInjection/FOSUserExtension.php

+2-11
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public function load(array $configs, ContainerBuilder $container)
113113
));
114114

115115
if (!empty($config['profile'])) {
116-
$this->loadProfile($config['profile'], $container, $loader, $config['db_driver']);
116+
$this->loadProfile($config['profile'], $container, $loader);
117117
}
118118

119119
if (!empty($config['registration'])) {
@@ -189,20 +189,11 @@ protected function remapParametersNamespaces(array $config, ContainerBuilder $co
189189
* @param array $config
190190
* @param ContainerBuilder $container
191191
* @param XmlFileLoader $loader
192-
* @param string $dbDriver
193192
*/
194-
private function loadProfile(array $config, ContainerBuilder $container, XmlFileLoader $loader, $dbDriver)
193+
private function loadProfile(array $config, ContainerBuilder $container, XmlFileLoader $loader)
195194
{
196195
$loader->load('profile.xml');
197196

198-
if ($config['email_update_confirmation']['enabled']) {
199-
if ('custom' !== $dbDriver && isset(self::$doctrineDrivers[$dbDriver])) {
200-
$loader->load('profile_email_update.xml');
201-
}
202-
$container->setParameter('fos_user.email_update_confirmation.template', $config['email_update_confirmation']['email_template']);
203-
$container->setParameter('fos_user.email_update_confirmation.cypher_method', $config['email_update_confirmation']['cypher_method']);
204-
}
205-
206197
$this->remapParametersNamespaces($config, $container, array(
207198
'form' => 'fos_user.profile.form.%s',
208199
));

Diff for: ‎Doctrine/EmailUpdateListener.php

-87
This file was deleted.

Diff for: ‎EventListener/FlashListener.php

-17
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ class FlashListener implements EventSubscriberInterface
3030
FOSUserEvents::PROFILE_EDIT_COMPLETED => 'profile.flash.updated',
3131
FOSUserEvents::REGISTRATION_COMPLETED => 'registration.flash.user_created',
3232
FOSUserEvents::RESETTING_RESET_COMPLETED => 'resetting.flash.success',
33-
FOSUserEvents::EMAIL_UPDATE_SUCCESS => 'email_update.flash.success',
34-
FOSUserEvents::EMAIL_UPDATE_INITIALIZE => 'email_update.flash.info',
3533
);
3634

3735
/**
@@ -69,8 +67,6 @@ public static function getSubscribedEvents()
6967
FOSUserEvents::PROFILE_EDIT_COMPLETED => 'addSuccessFlash',
7068
FOSUserEvents::REGISTRATION_COMPLETED => 'addSuccessFlash',
7169
FOSUserEvents::RESETTING_RESET_COMPLETED => 'addSuccessFlash',
72-
FOSUserEvents::EMAIL_UPDATE_SUCCESS => 'addSuccessFlash',
73-
FOSUserEvents::EMAIL_UPDATE_INITIALIZE => 'addInfoFlash',
7470
);
7571
}
7672

@@ -87,19 +83,6 @@ public function addSuccessFlash(Event $event, $eventName)
8783
$this->session->getFlashBag()->add('success', $this->trans(self::$successMessages[$eventName]));
8884
}
8985

90-
/**
91-
* @param Event $event
92-
* @param string $eventName
93-
*/
94-
public function addInfoFlash(Event $event, $eventName)
95-
{
96-
if (!isset(self::$successMessages[$eventName])) {
97-
throw new \InvalidArgumentException('This event does not correspond to a known flash message');
98-
}
99-
100-
$this->session->getFlashBag()->add('info', $this->trans(self::$successMessages[$eventName]));
101-
}
102-
10386
/**
10487
* @param string$message
10588
* @param array $params

Diff for: ‎FOSUserEvents.php

-18
Original file line numberDiff line numberDiff line change
@@ -318,22 +318,4 @@ final class FOSUserEvents
318318
* @Event("FOS\UserBundle\Event\UserEvent")
319319
*/
320320
const USER_DEMOTED = 'fos_user.user.demoted';
321-
322-
/**
323-
* The EMAIL_UPDATE_INITIALIZE event occurs when the email update process is initialized.
324-
*
325-
* This event allows you to access the user and to add some behaviour after email update is initialized..
326-
*
327-
* @Event("FOS\UserBundle\Event\UserEvent")
328-
*/
329-
const EMAIL_UPDATE_INITIALIZE = 'fos_user.update_email.initialize';
330-
331-
/**
332-
* The EMAIL_UPDATE_SUCCESS event occurs when the email was successfully updated through confirmation link.
333-
*
334-
* This event allows you to access the user and to add some behaviour after email was confirmed and updated..
335-
*
336-
* @Event("FOS\UserBundle\Event\UserEvent")
337-
*/
338-
const EMAIL_UPDATE_SUCCESS = 'fos_user.update_email.success';
339321
}

Diff for: ‎Mailer/Mailer.php

-18
Original file line numberDiff line numberDiff line change
@@ -84,24 +84,6 @@ public function sendResettingEmailMessage(UserInterface $user)
8484
$this->sendEmailMessage($rendered, $this->parameters['from_email']['resetting'], (string) $user->getEmail());
8585
}
8686

87-
/**
88-
* Send confirmation link to specified new user email.
89-
*
90-
* @param UserInterface $user
91-
* @param string $confirmationUrl
92-
* @param string $toEmail
93-
*/
94-
public function sendUpdateEmailConfirmation(UserInterface $user, $confirmationUrl, $toEmail)
95-
{
96-
$template = $this->parameters['email_updating.template'];
97-
$rendered = $this->templating->render($template, array(
98-
'user' => $user,
99-
'confirmationUrl' => $confirmationUrl,
100-
));
101-
102-
$this->sendEmailMessage($rendered, $this->parameters['from_email']['resetting'], $toEmail);
103-
}
104-
10587
/**
10688
* @param string $renderedTemplate
10789
* @param array|string $fromEmail

Diff for: ‎Mailer/MailerInterface.php

-9
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,4 @@ public function sendConfirmationEmailMessage(UserInterface $user);
3131
* @param UserInterface $user
3232
*/
3333
public function sendResettingEmailMessage(UserInterface $user);
34-
35-
/**
36-
* Send an email to a user to confirm the changed email address.
37-
*
38-
* @param UserInterface $user
39-
* @param string $confirmationUrl
40-
* @param string $toEmail
41-
*/
42-
public function sendUpdateEmailConfirmation(UserInterface $user, $confirmationUrl, $toEmail);
4334
}

Diff for: ‎Mailer/NoopMailer.php

-8
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,4 @@ public function sendResettingEmailMessage(UserInterface $user)
3737
{
3838
// nothing happens.
3939
}
40-
41-
/**
42-
* {@inheritdoc}
43-
*/
44-
public function sendUpdateEmailConfirmation(UserInterface $user, $confirmationUrl, $toEmail)
45-
{
46-
// nothing happens.
47-
}
4840
}

Diff for: ‎Mailer/TwigSwiftMailer.php

-20
Original file line numberDiff line numberDiff line change
@@ -87,26 +87,6 @@ public function sendResettingEmailMessage(UserInterface $user)
8787
$this->sendMessage($template, $context, $this->parameters['from_email']['resetting'], (string) $user->getEmail());
8888
}
8989

90-
/**
91-
* Send confirmation link to specified new user email.
92-
*
93-
* @param UserInterface $user
94-
* @param $confirmationUrl
95-
* @param $toEmail
96-
*
97-
* @return bool
98-
*/
99-
public function sendUpdateEmailConfirmation(UserInterface $user, $confirmationUrl, $toEmail)
100-
{
101-
$template = $this->parameters['template']['email_updating'];
102-
$context = array(
103-
'user' => $user,
104-
'confirmationUrl' => $confirmationUrl,
105-
);
106-
107-
$this->sendMessage($template, $context, $this->parameters['from_email']['confirmation'], $toEmail);
108-
}
109-
11090
/**
11191
* @param string $templateName
11292
* @param array $context

Diff for: ‎Resources/config/email_confirmation.xml

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<argument type="service" id="router" />
1313
<argument type="service" id="session" />
1414
</service>
15-
1615
</services>
1716

1817
</container>

Diff for: ‎Resources/config/mailer.xml

-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<parameters>
88
<parameter key="fos_user.resetting.email.template">@FOSUser/Resetting/email.txt.twig</parameter>
99
<parameter key="fos_user.registration.confirmation.template">@FOSUser/Registration/email.txt.twig</parameter>
10-
<parameter key="fos_user.email_update_confirmation.template">@FOSUser/Profile/email_update_confirmation.txt.twig</parameter>
1110
</parameters>
1211

1312
<services>
@@ -18,7 +17,6 @@
1817
<argument type="collection">
1918
<argument key="confirmation.template">%fos_user.registration.confirmation.template%</argument>
2019
<argument key="resetting.template">%fos_user.resetting.email.template%</argument>
21-
<argument key="email_updating.template">%fos_user.email_update_confirmation.template%</argument>
2220
<argument key="from_email" type="collection">
2321
<argument key="confirmation">%fos_user.registration.confirmation.from_email%</argument>
2422
<argument key="resetting">%fos_user.resetting.email.from_email%</argument>
@@ -35,7 +33,6 @@
3533
<argument key="template" type="collection">
3634
<argument key="confirmation">%fos_user.registration.confirmation.template%</argument>
3735
<argument key="resetting">%fos_user.resetting.email.template%</argument>
38-
<argument key="email_updating">%fos_user.email_update_confirmation.template%</argument>
3936
</argument>
4037
<argument key="from_email" type="collection">
4138
<argument key="confirmation">%fos_user.registration.confirmation.from_email%</argument>

Diff for: ‎Resources/config/profile_email_update.xml

-38
This file was deleted.

Diff for: ‎Resources/config/routing/all.xml

-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,4 @@
1818
<import
1919
resource="@FOSUserBundle/Resources/config/routing/change_password.xml"
2020
prefix="/profile" />
21-
<import
22-
resource="@FOSUserBundle/Resources/config/routing/update_email.xml"
23-
prefix="/profile" />
2421
</routes>

Diff for: ‎Resources/config/routing/update_email.xml

-11
This file was deleted.

Diff for: ‎Resources/doc/configuration_reference.rst

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ All available configuration options are listed below with their default values.
2121
form:
2222
type: FOS\UserBundle\Form\Type\ProfileFormType
2323
name: fos_user_profile_form
24-
validation_groups: [Profile, Default]
25-
email_update_confirmation:
26-
enabled: false # change to force confirmation of changed email by sending a confirmation link to the new address.
27-
email_template: '@FOSUser/Profile/email_update_confirmation.txt.twig'
28-
cypher_method: null # the cypher method to be used to encrypt/decrypt the email confirmation tokens. If not specified, the first method returned by openssl_get_cipher_methods will be used. See http://php.net/manual/function.openssl-get-cipher-methods.php
24+
validation_groups: [Profile, Default]openssl_get_cipher_methods will be used. See http://php.net/manual/function.openssl-get-cipher-methods.php
2925
change_password:
3026
form:
3127
type: FOS\UserBundle\Form\Type\ChangePasswordFormType

Diff for: ‎Resources/doc/emails.rst

-29
Original file line numberDiff line numberDiff line change
@@ -24,35 +24,6 @@ To enable it, update your configuration as follows:
2424
confirmation:
2525
enabled: true
2626
27-
Confirmation of Changed Email
28-
-----------------------------
29-
30-
When a user changes their email address on the edit profile page,
31-
the bundle can send a confirmation email to the new address. The
32-
new address will only be activated / written to the database once
33-
the user clicks on the confirmation link in the confirmation email.
34-
35-
Requiring email update confirmation is turned off by default.
36-
To enable it, update your configuration as follows:
37-
38-
.. code-block:: yaml
39-
40-
# app/config/config.yml
41-
fos_user:
42-
# ...
43-
profile:
44-
email_update_confirmation:
45-
enabled: true
46-
47-
When clicking the confirmation-link, the user has to be logged in. For the best
48-
user experience it is recommended to protect the url of the route `fos_user_update_email_confirm`
49-
in the security configuration.
50-
51-
.. code-block:: yaml
52-
security:
53-
access_control:
54-
- { path: "/{YOUR-PREFIX}/profile/confirm-email-update/{token}", roles: IS_AUTHENTICATED_REMEMBERED }
55-
5627
Password Reset
5728
--------------
5829

Diff for: ‎Resources/translations/FOSUserBundle.de.yml

-15
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,6 @@ change_password:
2727
submit: 'Passwort ändern'
2828
flash:
2929
success: 'Das Passwort wurde geändert.'
30-
email_update:
31-
flash:
32-
info: 'Bitte überprüfen Sie das Postfach der neuen Email-Adresse und klicken Sie den Link im Bestätigungsmail.'
33-
success: 'Email-Adresse wurde erfolgreich aktualisiert.'
34-
error:
35-
message: 'Ungültiger Bestätigungslink. Email-Adresse konnte nicht aktualisiert werden.'
36-
email:
37-
subject: 'Neue Email-Adresse Aktivierung bestätigen.'
38-
message: |
39-
Hallo %username%!
40-
41-
Um Ihre neue Email-Adresse zu aktivieren, besuchen Sie bitten den folgenden Link: %confirmationUrl%
42-
43-
Freundliche Grüße,
44-
das Team.
4530
registration:
4631
check_email: 'Eine E-Mail wurde an %email% gesendet. Sie enthält einen Link, den Sie anklicken müssen, um Ihr Benutzerkonto zu bestätigen.'
4732
confirmed: 'Glückwunsch %username%, Ihr Benutzerkonto ist jetzt bestätigt.'

Diff for: ‎Resources/translations/FOSUserBundle.en.yml

-16
Original file line numberDiff line numberDiff line change
@@ -31,22 +31,6 @@ change_password:
3131
flash:
3232
success: 'The password has been changed.'
3333

34-
email_update:
35-
flash:
36-
info: 'Please check the inbox of your new email address and click the link in the confirmation email.'
37-
success: 'E-mail was successfully updated'
38-
error:
39-
message: 'Invalid confirmation link. Can not update the email address.'
40-
email:
41-
subject: 'Confirm the activation of the new email address.'
42-
message: |
43-
Hello %username%!
44-
45-
To activate your new email address - please visit %confirmationUrl%
46-
47-
Kind regards,
48-
the Team.
49-
5034
registration:
5135
check_email: |
5236
An email has been sent to %email%. It contains an activation link you must click to activate your account.

Diff for: ‎Resources/translations/FOSUserBundle.fr.yml

+1-16
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,6 @@ change_password:
2828
flash:
2929
success: 'Le mot de passe a été modifié.'
3030

31-
email_update:
32-
flash:
33-
info: 'Un email a été envoyé à votre nouvelle adresse email. Il contient un lien d''activation sur lequel il vous faudra cliquer afin de confirmer l''adresse email.'
34-
success: 'l''e-mail a été mis à jour avec succès.'
35-
error:
36-
message: 'Lien de confirmation invalide. L''email ne peut pas être mis à jour.'
37-
email:
38-
subject: 'Confirmez l''activation de la nouvelle adresse email.'
39-
message: |
40-
Bonjour %username%!
41-
Pour activer votre nouvelle adresse email, merci de vous rendre sur %confirmationUrl%
42-
43-
Cordialement,
44-
L'équipe
45-
4631
registration:
4732
check_email: 'Un e-mail a été envoyé à l''adresse %email%. Il contient un lien d''activation sur lequel il vous faudra cliquer afin d''activer votre compte.'
4833
confirmed: 'Félicitations %username%, votre compte est maintenant activé.'
@@ -56,7 +41,7 @@ registration:
5641
Bonjour %username% !
5742
5843
Pour valider votre compte utilisateur, merci de vous rendre sur %confirmationUrl%
59-
44+
6045
Ce lien ne peut être utilisé qu'une seule fois pour valider votre compte.
6146
6247
Cordialement,

Diff for: ‎Resources/translations/FOSUserBundle.ru.yml

-16
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,6 @@ change_password:
2828
flash:
2929
success: 'Пароль изменен.'
3030

31-
email_update:
32-
flash:
33-
info: 'Пожалуйста, проверьте ваш новый почтовый ящик и перейдите по ссылке из письма для подтверждения изменений'
34-
success: 'Адрес электронной почты изменён'
35-
error:
36-
message: 'Ссылка для подтверждения E-mail не действительна. Не удалось обновить адрес электронной почты'
37-
email:
38-
subject: 'Подтвердите изменение адреса электронной почты.'
39-
message: |
40-
Приветствуем, %username%!
41-
42-
Для изменения адреса электронной почты пройдите по ссылке %confirmationUrl%
43-
44-
С наилучшими пожеланиями,
45-
команда сайта.
46-
4731
registration:
4832
check_email: 'Письмо отправлено на адрес %email%. В нём содержится ссылка, по которой вы можете подтвердить свою регистрацию.'
4933
confirmed: 'Поздравляем %username%, ваш аккаунт подтвержден.'

Diff for: ‎Resources/views/Profile/email_update_confirmation.txt.twig

-9
This file was deleted.

Diff for: ‎Services/EmailConfirmation/EmailEncryption.php

-190
This file was deleted.

Diff for: ‎Services/EmailConfirmation/EmailUpdateConfirmation.php

-196
This file was deleted.

Diff for: ‎Services/EmailConfirmation/Interfaces/EmailEncryptionInterface.php

-44
This file was deleted.

Diff for: ‎Services/EmailConfirmation/Interfaces/EmailUpdateConfirmationInterface.php

-48
This file was deleted.

Diff for: ‎Tests/DependencyInjection/FOSUserExtensionTest.php

+1-37
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class FOSUserExtensionTest extends TestCase
2323

2424
protected function tearDown()
2525
{
26-
unset($this->configuration);
26+
$this->configuration = null;
2727
}
2828

2929
/**
@@ -134,8 +134,6 @@ public function testDisableProfile()
134134
$config['profile'] = false;
135135
$loader->load(array($config), $this->configuration);
136136
$this->assertNotHasDefinition('fos_user.profile.form.factory');
137-
$this->assertNotHasDefinition('fos_user.email_update_confirmation.template');
138-
$this->assertNotHasDefinition('fos_user.email_update_confirmation.cypher_method');
139137
}
140138

141139
public function testDisableChangePassword()
@@ -244,9 +242,6 @@ public function testUserLoadConfirmationEmailWithDefaults()
244242
$this->assertParameter(array('admin@acme.org' => 'Acme Corp'), 'fos_user.registration.confirmation.from_email');
245243
$this->assertParameter('@FOSUser/Registration/email.txt.twig', 'fos_user.registration.confirmation.template');
246244
$this->assertParameter('@FOSUser/Resetting/email.txt.twig', 'fos_user.resetting.email.template');
247-
$this->assertParameter('@FOSUser/Profile/email_update_confirmation.txt.twig', 'fos_user.email_update_confirmation.template');
248-
$this->assertNotHasDefinition('fos_user.email_update_confirmation.cypher_method');
249-
$this->assertNotHasDefinition('fos_user.email_update_confirmation.template');
250245
$this->assertParameter(array('admin@acme.org' => 'Acme Corp'), 'fos_user.resetting.email.from_email');
251246
$this->assertParameter(86400, 'fos_user.resetting.token_ttl');
252247
}
@@ -261,35 +256,6 @@ public function testUserLoadConfirmationEmail()
261256
$this->assertParameter('AcmeMyBundle:Resetting:mail.txt.twig', 'fos_user.resetting.email.template');
262257
$this->assertParameter(array('reset@acme.org' => 'Acme Corp'), 'fos_user.resetting.email.from_email');
263258
$this->assertParameter(7200, 'fos_user.resetting.retry_ttl');
264-
$this->assertParameter('@FOSUser/Profile/email_update_confirmation.txt.twig', 'fos_user.email_update_confirmation.template');
265-
$this->assertParameter(null, 'fos_user.email_update_confirmation.cypher_method');
266-
}
267-
268-
public function testUserLoadConfirmationEmailAndUpdateConfirmation()
269-
{
270-
$this->configuration = new ContainerBuilder();
271-
$loader = new FOSUserExtension();
272-
$config = $this->getFullConfig();
273-
$loader->load(array($config), $this->configuration);
274-
$this->assertTrue($this->configuration instanceof ContainerBuilder);
275-
276-
$this->assertParameter(true, 'fos_user.registration.confirmation.enabled');
277-
$this->assertParameter(null, 'fos_user.email_update_confirmation.cypher_method');
278-
$this->assertParameter('@FOSUser/Profile/email_update_confirmation.txt.twig', 'fos_user.email_update_confirmation.template');
279-
}
280-
281-
public function testUserLoadConfirmationEmailAndNotUpdateConfirmation()
282-
{
283-
$this->configuration = new ContainerBuilder();
284-
$loader = new FOSUserExtension();
285-
$config = $this->getFullConfig();
286-
$config['profile']['email_update_confirmation']['enabled'] = false;
287-
$loader->load(array($config), $this->configuration);
288-
$this->assertTrue($this->configuration instanceof ContainerBuilder);
289-
290-
$this->assertParameter(true, 'fos_user.registration.confirmation.enabled');
291-
$this->assertNotHasDefinition('fos_user.email_update_confirmation.cypher_method');
292-
$this->assertNotHasDefinition('fos_user.email_update_confirmation.template');
293259
}
294260

295261
public function testUserLoadUtilServiceWithDefaults()
@@ -424,8 +390,6 @@ protected function getFullConfig()
424390
type: acme_my_profile
425391
name: acme_profile_form
426392
validation_groups: [acme_profile]
427-
email_update_confirmation:
428-
enabled: true
429393
change_password:
430394
form:
431395
type: acme_my_change_password

Diff for: ‎Tests/EventListener/FlashListenerTest.php

-5
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,4 @@ public function testAddSuccessFlash()
4545
{
4646
$this->listener->addSuccessFlash($this->event, FOSUserEvents::CHANGE_PASSWORD_COMPLETED);
4747
}
48-
49-
public function testAddInfoFlash()
50-
{
51-
$this->listener->addInfoFlash($this->event, FOSUserEvents::CHANGE_PASSWORD_COMPLETED);
52-
}
5348
}

Diff for: ‎Tests/Routing/RoutingTest.php

-5
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ public function testLoadRouting($routeName, $path, array $methods)
4545
$subCollection->addPrefix('/resetting');
4646
$collection->addCollection($subCollection);
4747
$collection->addCollection($loader->load(__DIR__.'/../../Resources/config/routing/security.xml'));
48-
$subCollection = $loader->load(__DIR__.'/../../Resources/config/routing/update_email.xml');
49-
$subCollection->addPrefix('/profile');
50-
$collection->addCollection($subCollection);
5148

5249
$route = $collection->get($routeName);
5350
$this->assertNotNull($route, sprintf('The route "%s" should exists', $routeName));
@@ -85,8 +82,6 @@ public function loadRoutingProvider()
8582
array('fos_user_security_login', '/login', array('GET', 'POST')),
8683
array('fos_user_security_check', '/login_check', array('POST')),
8784
array('fos_user_security_logout', '/logout', array('GET', 'POST')),
88-
89-
array('fos_user_update_email_confirm', '/profile/confirm-email-update/{token}', array('GET')),
9085
);
9186
}
9287
}

Diff for: ‎Tests/Services/EmailEncryptionTest.php

-104
This file was deleted.

Diff for: ‎Tests/Services/EmailUpdateConfirmationTest.php

-88
This file was deleted.

Diff for: ‎Upgrade.md

-11
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,6 @@ Upgrade instruction
44
This document describes the changes needed when upgrading because of a BC
55
break. For the full list of changes, please look at the Changelog file.
66

7-
## 2.0.x => 2.1.0
8-
9-
### MailerInterface
10-
For the implementation of [Confirmation of Changed Email](https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Resources/doc/emails.rst#confirmation-of-changed-email)-feature,
11-
the `FOSUserBundle/Mailer/MailerInterface` received a new method.
12-
13-
`public function sendUpdateEmailConfirmation(UserInterface $user, $confirmationUrl, $toEmail);`
14-
15-
If you use your own implementation of the `MailerInterface` and it does not inherit from one of the
16-
implementations in `FOSUserBundle/Mailer`, then you will need to implement the new function as well.
17-
187
## 2.0.0-alpha3 to 2.0.0-beta1
198

209
Methods and properties removed from `FOS\UserBundle\Model\User`

0 commit comments

Comments
 (0)
Please sign in to comment.