Merge pull request #3057 from stof/fix_deprecations

stof · web-flow · commit e8e6ed3f89bb · 2023-07-06T11:54:24.000+02:00
Fix deprecations
diff --git a/Command/ActivateUserCommand.php b/Command/ActivateUserCommand.php
@@ -41,7 +41,7 @@ public function __construct(UserManipulator $userManipulator)
         $this->userManipulator = $userManipulator;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             // BC with Symfony <5.3
@@ -69,7 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    protected function interact(InputInterface $input, OutputInterface $output)
+    protected function interact(InputInterface $input, OutputInterface $output): void
     {
         if (!$input->getArgument('username')) {
             $question = new Question('Please choose a username:');
diff --git a/Command/ChangePasswordCommand.php b/Command/ChangePasswordCommand.php
@@ -39,7 +39,7 @@ public function __construct(UserManipulator $userManipulator)
         $this->userManipulator = $userManipulator;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             // BC with Symfony <5.3
@@ -76,7 +76,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    protected function interact(InputInterface $input, OutputInterface $output)
+    protected function interact(InputInterface $input, OutputInterface $output): void
     {
         $questions = [];
 
diff --git a/Command/CreateUserCommand.php b/Command/CreateUserCommand.php
@@ -44,7 +44,7 @@ public function __construct(UserManipulator $userManipulator)
         $this->userManipulator = $userManipulator;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             // BC with Symfony <5.3
@@ -95,7 +95,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    protected function interact(InputInterface $input, OutputInterface $output)
+    protected function interact(InputInterface $input, OutputInterface $output): void
     {
         $questions = [];
 
diff --git a/Command/DeactivateUserCommand.php b/Command/DeactivateUserCommand.php
@@ -41,7 +41,7 @@ public function __construct(UserManipulator $userManipulator)
         $this->userManipulator = $userManipulator;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             // BC with Symfony <5.3
@@ -69,7 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
-    protected function interact(InputInterface $input, OutputInterface $output)
+    protected function interact(InputInterface $input, OutputInterface $output): void
     {
         if (!$input->getArgument('username')) {
             $question = new Question('Please choose a username:');
diff --git a/Command/DemoteUserCommand.php b/Command/DemoteUserCommand.php
@@ -29,7 +29,7 @@ class DemoteUserCommand extends RoleCommand
     // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:demote';
 
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -46,7 +46,7 @@ protected function configure()
             );
     }
 
-    protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role)
+    protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role): void
     {
         if ($super) {
             $manipulator->demote($username);
diff --git a/Command/PromoteUserCommand.php b/Command/PromoteUserCommand.php
@@ -31,7 +31,7 @@ class PromoteUserCommand extends RoleCommand
     // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:promote';
 
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
@@ -48,7 +48,7 @@ protected function configure()
             );
     }
 
-    protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role)
+    protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role): void
     {
         if ($super) {
             $manipulator->promote($username);
diff --git a/Command/RoleCommand.php b/Command/RoleCommand.php
@@ -35,7 +35,7 @@ public function __construct(UserManipulator $userManipulator)
         $this->userManipulator = $userManipulator;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDefinition([
@@ -72,9 +72,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int
      * @param bool   $super
      * @param string $role
      */
-    abstract protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role);
+    abstract protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role): void;
 
-    protected function interact(InputInterface $input, OutputInterface $output)
+    protected function interact(InputInterface $input, OutputInterface $output): void
     {
         $questions = [];
 
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -81,7 +81,7 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $treeBuilder;
     }
 
-    private function addProfileSection(ArrayNodeDefinition $node)
+    private function addProfileSection(ArrayNodeDefinition $node): void
     {
         $node
             ->children()
@@ -106,7 +106,7 @@ private function addProfileSection(ArrayNodeDefinition $node)
             ->end();
     }
 
-    private function addRegistrationSection(ArrayNodeDefinition $node)
+    private function addRegistrationSection(ArrayNodeDefinition $node): void
     {
         $node
             ->children()
@@ -144,7 +144,7 @@ private function addRegistrationSection(ArrayNodeDefinition $node)
             ->end();
     }
 
-    private function addResettingSection(ArrayNodeDefinition $node)
+    private function addResettingSection(ArrayNodeDefinition $node): void
     {
         $node
             ->children()
@@ -183,7 +183,7 @@ private function addResettingSection(ArrayNodeDefinition $node)
             ->end();
     }
 
-    private function addChangePasswordSection(ArrayNodeDefinition $node)
+    private function addChangePasswordSection(ArrayNodeDefinition $node): void
     {
         $node
             ->children()
@@ -207,7 +207,7 @@ private function addChangePasswordSection(ArrayNodeDefinition $node)
             ->end();
     }
 
-    private function addServiceSection(ArrayNodeDefinition $node)
+    private function addServiceSection(ArrayNodeDefinition $node): void
     {
         $node
             ->addDefaultsIfNotSet()
diff --git a/DependencyInjection/FOSUserExtension.php b/DependencyInjection/FOSUserExtension.php
@@ -49,7 +49,7 @@ class FOSUserExtension extends Extension
     private $mailerNeeded = false;
     private $sessionNeeded = false;
 
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $processor = new Processor();
         $configuration = new Configuration();
@@ -151,7 +151,7 @@ public function getNamespace(): string
         return 'http://friendsofsymfony.github.io/schema/dic/user';
     }
 
-    protected function remapParameters(array $config, ContainerBuilder $container, array $map)
+    protected function remapParameters(array $config, ContainerBuilder $container, array $map): void
     {
         foreach ($map as $name => $paramName) {
             if (array_key_exists($name, $config)) {
@@ -160,7 +160,7 @@ protected function remapParameters(array $config, ContainerBuilder $container, a
         }
     }
 
-    protected function remapParametersNamespaces(array $config, ContainerBuilder $container, array $namespaces)
+    protected function remapParametersNamespaces(array $config, ContainerBuilder $container, array $namespaces): void
     {
         foreach ($namespaces as $ns => $map) {
             if ($ns) {
@@ -181,7 +181,7 @@ protected function remapParametersNamespaces(array $config, ContainerBuilder $co
         }
     }
 
-    private function loadProfile(array $config, ContainerBuilder $container, XmlFileLoader $loader)
+    private function loadProfile(array $config, ContainerBuilder $container, XmlFileLoader $loader): void
     {
         $loader->load('profile.xml');
 
@@ -190,7 +190,7 @@ private function loadProfile(array $config, ContainerBuilder $container, XmlFile
         ]);
     }
 
-    private function loadRegistration(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $fromEmail)
+    private function loadRegistration(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $fromEmail): void
     {
         $loader->load('registration.xml');
         $this->sessionNeeded = true;
@@ -213,7 +213,7 @@ private function loadRegistration(array $config, ContainerBuilder $container, Xm
         ]);
     }
 
-    private function loadChangePassword(array $config, ContainerBuilder $container, XmlFileLoader $loader)
+    private function loadChangePassword(array $config, ContainerBuilder $container, XmlFileLoader $loader): void
     {
         $loader->load('change_password.xml');
 
@@ -222,7 +222,7 @@ private function loadChangePassword(array $config, ContainerBuilder $container,
         ]);
     }
 
-    private function loadResetting(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $fromEmail)
+    private function loadResetting(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $fromEmail): void
     {
         $this->mailerNeeded = true;
         $loader->load('resetting.xml');
diff --git a/FOSUserBundle.php b/FOSUserBundle.php
@@ -51,7 +51,7 @@ private function addRegisterMappingsPass(ContainerBuilder $container)
         ];
 
         if (class_exists('Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass')) {
-            $container->addCompilerPass(DoctrineOrmMappingsPass::createXmlMappingDriver($mappings, ['fos_user.model_manager_name'], 'fos_user.backend_type_orm'));
+            $container->addCompilerPass(DoctrineOrmMappingsPass::createXmlMappingDriver($mappings, ['fos_user.model_manager_name'], 'fos_user.backend_type_orm', [], true));
         }
 
         if (class_exists('Doctrine\Bundle\MongoDBBundle\DependencyInjection\Compiler\DoctrineMongoDBMappingsPass')) {
diff --git a/Form/Type/ChangePasswordFormType.php b/Form/Type/ChangePasswordFormType.php
@@ -37,7 +37,7 @@ public function __construct($class)
         $this->class = $class;
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $constraintsOptions = [
             'message' => 'fos_user.current_password.invalid',
@@ -74,7 +74,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ]);
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => $this->class,
diff --git a/Form/Type/ProfileFormType.php b/Form/Type/ProfileFormType.php
@@ -37,7 +37,7 @@ public function __construct($class)
         $this->class = $class;
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $this->buildUserForm($builder, $options);
 
@@ -63,7 +63,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ]);
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => $this->class,
@@ -79,7 +79,7 @@ public function getBlockPrefix(): string
     /**
      * Builds the embedded form representing the user.
      */
-    protected function buildUserForm(FormBuilderInterface $builder, array $options)
+    protected function buildUserForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('username', null, ['label' => 'form.username', 'translation_domain' => 'FOSUserBundle'])
diff --git a/Form/Type/RegistrationFormType.php b/Form/Type/RegistrationFormType.php
@@ -36,7 +36,7 @@ public function __construct($class)
         $this->class = $class;
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('email', EmailType::class, ['label' => 'form.email', 'translation_domain' => 'FOSUserBundle'])
@@ -56,7 +56,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => $this->class,
diff --git a/Form/Type/ResettingFormType.php b/Form/Type/ResettingFormType.php
@@ -35,7 +35,7 @@ public function __construct($class)
         $this->class = $class;
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->add('plainPassword', RepeatedType::class, [
             'type' => PasswordType::class,
@@ -51,7 +51,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         ]);
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => $this->class,
diff --git a/Form/Type/UsernameFormType.php b/Form/Type/UsernameFormType.php
@@ -38,7 +38,7 @@ public function __construct(UserToUsernameTransformer $usernameTransformer)
         $this->usernameTransformer = $usernameTransformer;
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder->addModelTransformer($this->usernameTransformer);
     }
diff --git a/Model/User.php b/Model/User.php
@@ -180,6 +180,9 @@ public function addRole($role)
         return $this;
     }
 
+    /**
+     * @return void
+     */
     public function eraseCredentials()
     {
         $this->plainPassword = null;
diff --git a/Security/UserChecker.php b/Security/UserChecker.php
@@ -22,6 +22,9 @@
  */
 class UserChecker implements UserCheckerInterface
 {
+    /**
+     * @return void
+     */
     public function checkPreAuth(BaseUserInterface $user)
     {
         if (!$user->isEnabled()) {
@@ -31,6 +34,9 @@ public function checkPreAuth(BaseUserInterface $user)
         }
     }
 
+    /**
+     * @return void
+     */
     public function checkPostAuth(BaseUserInterface $user)
     {
     }
diff --git a/Tests/Mailer/TwigSwiftMailerTest.php b/Tests/Mailer/TwigSwiftMailerTest.php
@@ -14,6 +14,9 @@
 use FOS\UserBundle\Mailer\TwigSwiftMailer;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @group legacy
+ */
 class TwigSwiftMailerTest extends TestCase
 {
     /**

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public function __construct(UserManipulator $userManipulator)`
`41`	`41`	`$this->userManipulator = $userManipulator;`
`42`	`42`	`}`
`43`	`43`
`44`		`- protected function configure()`
	`44`	`+ protected function configure(): void`
`45`	`45`	`{`
`46`	`46`	`$this`
`47`	`47`	`// BC with Symfony <5.3`
`@@ -69,7 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`69`	`69`	`return 0;`
`70`	`70`	`}`
`71`	`71`
`72`		`- protected function interact(InputInterface $input, OutputInterface $output)`
	`72`	`+ protected function interact(InputInterface $input, OutputInterface $output): void`
`73`	`73`	`{`
`74`	`74`	`if (!$input->getArgument('username')) {`
`75`	`75`	`$question = new Question('Please choose a username:');`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function __construct(UserManipulator $userManipulator)`
`39`	`39`	`$this->userManipulator = $userManipulator;`
`40`	`40`	`}`
`41`	`41`
`42`		`- protected function configure()`
	`42`	`+ protected function configure(): void`
`43`	`43`	`{`
`44`	`44`	`$this`
`45`	`45`	`// BC with Symfony <5.3`
`@@ -76,7 +76,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`76`	`76`	`return 0;`
`77`	`77`	`}`
`78`	`78`
`79`		`- protected function interact(InputInterface $input, OutputInterface $output)`
	`79`	`+ protected function interact(InputInterface $input, OutputInterface $output): void`
`80`	`80`	`{`
`81`	`81`	`$questions = [];`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(UserManipulator $userManipulator)`
`44`	`44`	`$this->userManipulator = $userManipulator;`
`45`	`45`	`}`
`46`	`46`
`47`		`- protected function configure()`
	`47`	`+ protected function configure(): void`
`48`	`48`	`{`
`49`	`49`	`$this`
`50`	`50`	`// BC with Symfony <5.3`
`@@ -95,7 +95,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`95`	`95`	`return 0;`
`96`	`96`	`}`
`97`	`97`
`98`		`- protected function interact(InputInterface $input, OutputInterface $output)`
	`98`	`+ protected function interact(InputInterface $input, OutputInterface $output): void`
`99`	`99`	`{`
`100`	`100`	`$questions = [];`
`101`	`101`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class DemoteUserCommand extends RoleCommand`
`29`	`29`	`// BC with Symfony <5.3`
`30`	`30`	`protected static $defaultName = 'fos:user:demote';`
`31`	`31`
`32`		`- protected function configure()`
	`32`	`+ protected function configure(): void`
`33`	`33`	`{`
`34`	`34`	`parent::configure();`
`35`	`35`
`@@ -46,7 +46,7 @@ protected function configure()`
`46`	`46`	`);`
`47`	`47`	`}`
`48`	`48`
`49`		`- protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role)`
	`49`	`+ protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role): void`
`50`	`50`	`{`
`51`	`51`	`if ($super) {`
`52`	`52`	`$manipulator->demote($username);`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class PromoteUserCommand extends RoleCommand`
`31`	`31`	`// BC with Symfony <5.3`
`32`	`32`	`protected static $defaultName = 'fos:user:promote';`
`33`	`33`
`34`		`- protected function configure()`
	`34`	`+ protected function configure(): void`
`35`	`35`	`{`
`36`	`36`	`parent::configure();`
`37`	`37`
`@@ -48,7 +48,7 @@ protected function configure()`
`48`	`48`	`);`
`49`	`49`	`}`
`50`	`50`
`51`		`- protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role)`
	`51`	`+ protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role): void`
`52`	`52`	`{`
`53`	`53`	`if ($super) {`
`54`	`54`	`$manipulator->promote($username);`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function __construct(UserManipulator $userManipulator)`
`35`	`35`	`$this->userManipulator = $userManipulator;`
`36`	`36`	`}`
`37`	`37`
`38`		`- protected function configure()`
	`38`	`+ protected function configure(): void`
`39`	`39`	`{`
`40`	`40`	`$this`
`41`	`41`	`->setDefinition([`
`@@ -72,9 +72,9 @@ protected function execute(InputInterface $input, OutputInterface $output): int`
`72`	`72`	`* @param bool $super`
`73`	`73`	`* @param string $role`
`74`	`74`	`*/`
`75`		`- abstract protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role);`
	`75`	`+ abstract protected function executeRoleCommand(UserManipulator $manipulator, OutputInterface $output, $username, $super, $role): void;`
`76`	`76`
`77`		`- protected function interact(InputInterface $input, OutputInterface $output)`
	`77`	`+ protected function interact(InputInterface $input, OutputInterface $output): void`
`78`	`78`	`{`
`79`	`79`	`$questions = [];`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public function getConfigTreeBuilder(): TreeBuilder`
`81`	`81`	`return $treeBuilder;`
`82`	`82`	`}`
`83`	`83`
`84`		`- private function addProfileSection(ArrayNodeDefinition $node)`
	`84`	`+ private function addProfileSection(ArrayNodeDefinition $node): void`
`85`	`85`	`{`
`86`	`86`	`$node`
`87`	`87`	`->children()`
`@@ -106,7 +106,7 @@ private function addProfileSection(ArrayNodeDefinition $node)`
`106`	`106`	`->end();`
`107`	`107`	`}`
`108`	`108`
`109`		`- private function addRegistrationSection(ArrayNodeDefinition $node)`
	`109`	`+ private function addRegistrationSection(ArrayNodeDefinition $node): void`
`110`	`110`	`{`
`111`	`111`	`$node`
`112`	`112`	`->children()`
`@@ -144,7 +144,7 @@ private function addRegistrationSection(ArrayNodeDefinition $node)`
`144`	`144`	`->end();`
`145`	`145`	`}`
`146`	`146`
`147`		`- private function addResettingSection(ArrayNodeDefinition $node)`
	`147`	`+ private function addResettingSection(ArrayNodeDefinition $node): void`
`148`	`148`	`{`
`149`	`149`	`$node`
`150`	`150`	`->children()`
`@@ -183,7 +183,7 @@ private function addResettingSection(ArrayNodeDefinition $node)`
`183`	`183`	`->end();`
`184`	`184`	`}`
`185`	`185`
`186`		`- private function addChangePasswordSection(ArrayNodeDefinition $node)`
	`186`	`+ private function addChangePasswordSection(ArrayNodeDefinition $node): void`
`187`	`187`	`{`
`188`	`188`	`$node`
`189`	`189`	`->children()`
`@@ -207,7 +207,7 @@ private function addChangePasswordSection(ArrayNodeDefinition $node)`
`207`	`207`	`->end();`
`208`	`208`	`}`
`209`	`209`
`210`		`- private function addServiceSection(ArrayNodeDefinition $node)`
	`210`	`+ private function addServiceSection(ArrayNodeDefinition $node): void`
`211`	`211`	`{`
`212`	`212`	`$node`
`213`	`213`	`->addDefaultsIfNotSet()`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class FOSUserExtension extends Extension`
`49`	`49`	`private $mailerNeeded = false;`
`50`	`50`	`private $sessionNeeded = false;`
`51`	`51`
`52`		`- public function load(array $configs, ContainerBuilder $container)`
	`52`	`+ public function load(array $configs, ContainerBuilder $container): void`
`53`	`53`	`{`
`54`	`54`	`$processor = new Processor();`
`55`	`55`	`$configuration = new Configuration();`
`@@ -151,7 +151,7 @@ public function getNamespace(): string`
`151`	`151`	`return 'http://friendsofsymfony.github.io/schema/dic/user';`
`152`	`152`	`}`
`153`	`153`
`154`		`- protected function remapParameters(array $config, ContainerBuilder $container, array $map)`
	`154`	`+ protected function remapParameters(array $config, ContainerBuilder $container, array $map): void`
`155`	`155`	`{`
`156`	`156`	`foreach ($map as $name => $paramName) {`
`157`	`157`	`if (array_key_exists($name, $config)) {`
`@@ -160,7 +160,7 @@ protected function remapParameters(array $config, ContainerBuilder $container, a`
`160`	`160`	`}`
`161`	`161`	`}`
`162`	`162`
`163`		`- protected function remapParametersNamespaces(array $config, ContainerBuilder $container, array $namespaces)`
	`163`	`+ protected function remapParametersNamespaces(array $config, ContainerBuilder $container, array $namespaces): void`
`164`	`164`	`{`
`165`	`165`	`foreach ($namespaces as $ns => $map) {`
`166`	`166`	`if ($ns) {`
`@@ -181,7 +181,7 @@ protected function remapParametersNamespaces(array $config, ContainerBuilder $co`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`
`184`		`- private function loadProfile(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
	`184`	`+ private function loadProfile(array $config, ContainerBuilder $container, XmlFileLoader $loader): void`
`185`	`185`	`{`
`186`	`186`	`$loader->load('profile.xml');`
`187`	`187`
`@@ -190,7 +190,7 @@ private function loadProfile(array $config, ContainerBuilder $container, XmlFile`
`190`	`190`	`]);`
`191`	`191`	`}`
`192`	`192`
`193`		`- private function loadRegistration(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $fromEmail)`
	`193`	`+ private function loadRegistration(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $fromEmail): void`
`194`	`194`	`{`
`195`	`195`	`$loader->load('registration.xml');`
`196`	`196`	`$this->sessionNeeded = true;`
`@@ -213,7 +213,7 @@ private function loadRegistration(array $config, ContainerBuilder $container, Xm`
`213`	`213`	`]);`
`214`	`214`	`}`
`215`	`215`
`216`		`- private function loadChangePassword(array $config, ContainerBuilder $container, XmlFileLoader $loader)`
	`216`	`+ private function loadChangePassword(array $config, ContainerBuilder $container, XmlFileLoader $loader): void`
`217`	`217`	`{`
`218`	`218`	`$loader->load('change_password.xml');`
`219`	`219`
`@@ -222,7 +222,7 @@ private function loadChangePassword(array $config, ContainerBuilder $container,`
`222`	`222`	`]);`
`223`	`223`	`}`
`224`	`224`
`225`		`- private function loadResetting(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $fromEmail)`
	`225`	`+ private function loadResetting(array $config, ContainerBuilder $container, XmlFileLoader $loader, array $fromEmail): void`
`226`	`226`	`{`
`227`	`227`	`$this->mailerNeeded = true;`
`228`	`228`	`$loader->load('resetting.xml');`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ private function addRegisterMappingsPass(ContainerBuilder $container)`
`51`	`51`	`];`
`52`	`52`
`53`	`53`	`if (class_exists('Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass')) {`
`54`		`- $container->addCompilerPass(DoctrineOrmMappingsPass::createXmlMappingDriver($mappings, ['fos_user.model_manager_name'], 'fos_user.backend_type_orm'));`
	`54`	`+ $container->addCompilerPass(DoctrineOrmMappingsPass::createXmlMappingDriver($mappings, ['fos_user.model_manager_name'], 'fos_user.backend_type_orm', [], true));`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if (class_exists('Doctrine\Bundle\MongoDBBundle\DependencyInjection\Compiler\DoctrineMongoDBMappingsPass')) {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct($class)`
`37`	`37`	`$this->class = $class;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function buildForm(FormBuilderInterface $builder, array $options)`
	`40`	`+ public function buildForm(FormBuilderInterface $builder, array $options): void`
`41`	`41`	`{`
`42`	`42`	`$constraintsOptions = [`
`43`	`43`	`'message' => 'fos_user.current_password.invalid',`
`@@ -74,7 +74,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`74`	`74`	`]);`
`75`	`75`	`}`
`76`	`76`
`77`		`- public function configureOptions(OptionsResolver $resolver)`
	`77`	`+ public function configureOptions(OptionsResolver $resolver): void`
`78`	`78`	`{`
`79`	`79`	`$resolver->setDefaults([`
`80`	`80`	`'data_class' => $this->class,`