Merge branch '1.14' into 2.0

* 1.14:
  [UserBundle] Deprecate pin configuration parameter

src/Sylius/Bundle/CoreBundle/EventListener/MailerListener.php

@@ -39,6 +39,7 @@ final class MailerListener
         $this->sendEmail($event->getSubject(), UserBundleEmails::RESET_PASSWORD_TOKEN);
     }
 
+    /** @deprecated since Sylius 1.14 and will be removed in Sylius 2.0. */
     public function sendResetPasswordPinEmail(GenericEvent $event): void
     {
         $this->sendEmail($event->getSubject(), UserBundleEmails::RESET_PASSWORD_PIN);

src/Sylius/Bundle/ShopBundle/Resources/config/app/sylius/sylius_mailer.yml

@@ -18,6 +18,7 @@ sylius_mailer:
         reset_password_token:
             subject: sylius.emails.user.password_reset.subject
             template: "@SyliusShop/email/password_reset.html.twig"
+        # This email is deprecated since Sylius 1.14 and will be removed in 2.0.
         reset_password_pin:
             subject: sylius.emails.user.password_reset.subject
             template: "@SyliusShop/email/password_reset.html.twig"

src/Sylius/Bundle/UserBundle/Controller/UserController.php

@@ -72,6 +72,7 @@ class UserController extends ResourceController
         return $this->prepareResetPasswordRequest($request, $generator, UserEvents::REQUEST_RESET_PASSWORD_TOKEN);
     }
 
+    /** @deprecated since Sylius 1.14 and will be removed in Sylius 2.0. */
     public function requestPasswordResetPinAction(Request $request): Response
     {
         /** @var GeneratorInterface $generator */

src/Sylius/Bundle/UserBundle/DependencyInjection/Configuration.php

@@ -100,6 +100,7 @@ final class Configuration implements ConfigurationInterface
                                                 ->end()
                                             ->end()
                                             ->arrayNode('pin')
+                                                ->setDeprecated('sylius/user-bundle', '1.14', 'The "%path%.%node%" is deprecated and will be removed in 2.0.')
                                                 ->addDefaultsIfNotSet()
                                                 ->children()
                                                     ->integerNode('length')

src/Sylius/Bundle/UserBundle/EventListener/MailerListener.php

@@ -30,6 +30,7 @@ class MailerListener
         $this->sendEmail($event->getSubject(), Emails::RESET_PASSWORD_TOKEN);
     }
 
+    /** @deprecated since Sylius 1.14 and will be removed in Sylius 2.0. */
     public function sendResetPasswordPinEmail(GenericEvent $event): void
     {
         $this->sendEmail($event->getSubject(), Emails::RESET_PASSWORD_PIN);

src/Sylius/Bundle/UserBundle/Mailer/Emails.php

@@ -17,6 +17,7 @@ final class Emails
 {
     public const RESET_PASSWORD_TOKEN = 'reset_password_token';
 
+    /** @deprecated since Sylius 1.14 and will be removed in Sylius 2.0. */
     public const RESET_PASSWORD_PIN = 'reset_password_pin';
 
     public const EMAIL_VERIFICATION_TOKEN = 'verification_token';

src/Sylius/Bundle/UserBundle/UserEvents.php

@@ -17,6 +17,7 @@ interface UserEvents
 {
     public const REQUEST_RESET_PASSWORD_TOKEN = 'sylius.user.password_reset.request.token';
 
+    /** @deprecated since Sylius 1.14 and will be removed in Sylius 2.0. */
     public const REQUEST_RESET_PASSWORD_PIN = 'sylius.user.password_reset.request.pin';
 
     public const REQUEST_VERIFICATION_TOKEN = 'sylius.user.email_verification.token';