symfony
diff --git a/‎src/Maker/MakeUser.php
Lines changed: 8 additions & 4 deletions b/‎src/Maker/MakeUser.php
Lines changed: 8 additions & 4 deletions
diff --git a/‎src/Security/SecurityConfigUpdater.php
Lines changed: 2 additions & 1 deletion b/‎src/Security/SecurityConfigUpdater.php
Lines changed: 2 additions & 1 deletion
diff --git a/‎src/Security/UserClassConfiguration.php
Lines changed: 7 additions & 1 deletion b/‎src/Security/UserClassConfiguration.php
Lines changed: 7 additions & 1 deletion
@@ -32,6 +32,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Security\Core\Encoder\Argon2iPasswordEncoder;
+use Symfony\Component\Security\Core\Encoder\NativePasswordEncoder;
 use Symfony\Component\Yaml\Yaml;
 
 /**
@@ -67,7 +68,7 @@ public function configureCommand(Command $command, InputConfiguration $inputConf
             ->addOption('is-entity', null, InputOption::VALUE_NONE, 'Do you want to store user data in the database (via Doctrine)?')
             ->addOption('identity-property-name', null, InputOption::VALUE_REQUIRED, 'Enter a property name that will be the unique "display" name for the user (e.g. <comment>email, username, uuid</comment>)')
             ->addOption('with-password', null, InputOption::VALUE_NONE, 'Will this app be responsible for checking the password? Choose <comment>No</comment> if the password is actually checked by some other system (e.g. a single sign-on server)')
-            ->addOption('use-argon2', null, InputOption::VALUE_NONE, 'Use the Argon2i password encoder?')
+            ->addOption('use-argon2', null, InputOption::VALUE_NONE, 'Use the Argon2i password encoder? (deprecated)')
             ->setHelp(file_get_contents(__DIR__.'/../Resources/help/MakeUser.txt'))
         ;
 
@@ -107,12 +108,12 @@ class_exists(DoctrineBundle::class)
         $input->setOption('with-password', $userWillHavePassword);
 
         $useArgon2Encoder = false;
-        if ($userWillHavePassword && Argon2iPasswordEncoder::isSupported()) {
+        if ($userWillHavePassword && !class_exists(NativePasswordEncoder::class) && Argon2iPasswordEncoder::isSupported()) {
             $io->writeln('The newer <comment>Argon2i</comment> password hasher requires PHP 7.2, libsodium or paragonie/sodium_compat. Your system DOES support this algorithm.');
             $io->writeln('You should use <comment>Argon2i</comment> unless your production system will not support it.');
             $useArgon2Encoder = $io->confirm('Use <comment>Argon2i</comment> as your password hasher (bcrypt will be used otherwise)?');
+            $input->setOption('use-argon2', $useArgon2Encoder);
         }
-        $input->setOption('use-argon2', $useArgon2Encoder);
     }
 
     public function generate(InputInterface $input, ConsoleStyle $io, Generator $generator)
@@ -122,7 +123,10 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
             $input->getOption('identity-property-name'),
             $input->getOption('with-password')
         );
-        $userClassConfiguration->useArgon2($input->getOption('use-argon2'));
+        if ($input->getOption('use-argon2')) {
+            @trigger_error('The "--use-argon2" option is deprecated since MakerBundle 1.12.', E_USER_DEPRECATED);
+            $userClassConfiguration->useArgon2(true);
+        }
 
         $userClassNameDetails = $generator->createClassNameDetails(
             $input->getArgument('name'),
 
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\MakerBundle\Security;
 
 use Symfony\Bundle\MakerBundle\Util\YamlSourceManipulator;
+use Symfony\Component\Security\Core\Encoder\NativePasswordEncoder;
 
 /**
  * @internal
@@ -137,7 +138,7 @@ private function updateEncoders(UserClassConfiguration $userConfig, string $user
         }
 
         $newData['security']['encoders'][$userClass] = [
-            'algorithm' => $userConfig->shouldUseArgon2() ? 'argon2i' : 'bcrypt',
+            'algorithm' => $userConfig->shouldUseArgon2() ? 'argon2i' : (class_exists(NativePasswordEncoder::class) ? 'auto' : 'bcrypt'),
         ];
         $newData['security']['encoders']['_'] = $this->manipulator->createEmptyLine();
 
 
@@ -24,7 +24,7 @@ final class UserClassConfiguration
 
     private $hasPassword;
 
-    private $useArgon2 = true;
+    private $useArgon2 = false;
 
     private $userProviderClass;
 
@@ -50,11 +50,17 @@ public function hasPassword(): bool
         return $this->hasPassword;
     }
 
+    /**
+     * @deprecated since MakerBundle 1.12
+     */
     public function useArgon2(bool $shouldUse)
     {
         $this->useArgon2 = $shouldUse;
     }
 
+    /**
+     * @deprecated since MakerBundle 1.12
+     */
     public function shouldUseArgon2(): bool
     {
         return $this->useArgon2;
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ final class UserClassConfiguration`
`24`	`24`
`25`	`25`	`private $hasPassword;`
`26`	`26`
`27`		`- private $useArgon2 = true;`
	`27`	`+ private $useArgon2 = false;`
`28`	`28`
`29`	`29`	`private $userProviderClass;`
`30`	`30`
`@@ -50,11 +50,17 @@ public function hasPassword(): bool`
`50`	`50`	`return $this->hasPassword;`
`51`	`51`	`}`
`52`	`52`
	`53`	`+ /**`
	`54`	`+ * @deprecated since MakerBundle 1.12`
	`55`	`+ */`
`53`	`56`	`public function useArgon2(bool $shouldUse)`
`54`	`57`	`{`
`55`	`58`	`$this->useArgon2 = $shouldUse;`
`56`	`59`	`}`
`57`	`60`
	`61`	`+ /**`
	`62`	`+ * @deprecated since MakerBundle 1.12`
	`63`	`+ */`
`58`	`64`	`public function shouldUseArgon2(): bool`
`59`	`65`	`{`
`60`	`66`	`return $this->useArgon2;`