symfony
diff --git a/‎src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
Lines changed: 0 additions & 216 deletions b/‎src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php
Lines changed: 0 additions & 216 deletions
diff --git a/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
Lines changed: 0 additions & 70 deletions b/‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
Lines changed: 0 additions & 70 deletions
@@ -5,6 +5,12 @@ CHANGELOG
 ---
 
  * The `security.authorization_checker` and `security.token_storage` services are now private
+ * Remove `UserPasswordEncoderCommand` class and the corresponding `user:encode-password` command,
+   use `UserPasswordHashCommand` and `user:hash-password` instead
+ * Remove the `security.encoder_factory.generic` service, the `security.encoder_factory` and `Symfony\Component\Security\Core\Encoder\EncoderFactoryInterface` aliases,
+   use `security.password_hasher_factory` and `Symfony\Component\PasswordHasher\Hasher\PasswordHasherFactoryInterface` instead
+ * Remove the `security.user_password_encoder.generic` service, the `security.password_encoder` and the `Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface` aliases,
+   use `security.user_password_hasher`, `security.password_hasher` and `Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface` instead
 
 5.3
 ---
 
@@ -66,23 +66,6 @@ public function getConfigTreeBuilder()
                     return $v;
                 })
             ->end()
-            ->beforeNormalization()
-                ->ifTrue(function ($v) {
-                    if ($v['encoders'] ?? false) {
-                        trigger_deprecation('symfony/security-bundle', '5.3', 'The child node "encoders" at path "security" is deprecated, use "password_hashers" instead.');
-
-                        return true;
-                    }
-
-                    return $v['password_hashers'] ?? false;
-                })
-                ->then(function ($v) {
-                    $v['password_hashers'] = array_merge($v['password_hashers'] ?? [], $v['encoders'] ?? []);
-                    $v['encoders'] = $v['password_hashers'];
-
-                    return $v;
-                })
-            ->end()
             ->children()
                 ->scalarNode('access_denied_url')->defaultNull()->example('/foo/error403')->end()
                 ->enumNode('session_fixation_strategy')
@@ -111,7 +94,6 @@ public function getConfigTreeBuilder()
             ->end()
         ;
 
-        $this->addEncodersSection($rootNode);
         $this->addPasswordHashersSection($rootNode);
         $this->addProvidersSection($rootNode);
         $this->addFirewallsSection($rootNode, $this->factories);
@@ -392,58 +374,6 @@ private function addProvidersSection(ArrayNodeDefinition $rootNode)
         ;
     }
 
-    private function addEncodersSection(ArrayNodeDefinition $rootNode)
-    {
-        $rootNode
-            ->fixXmlConfig('encoder')
-            ->children()
-                ->arrayNode('encoders')
-                    ->example([
-                        'App\Entity\User1' => 'auto',
-                        'App\Entity\User2' => [
-                            'algorithm' => 'auto',
-                            'time_cost' => 8,
-                            'cost' => 13,
-                        ],
-                    ])
-                    ->requiresAtLeastOneElement()
-                    ->useAttributeAsKey('class')
-                    ->prototype('array')
-                        ->canBeUnset()
-                        ->performNoDeepMerging()
-                        ->beforeNormalization()->ifString()->then(function ($v) { return ['algorithm' => $v]; })->end()
-                        ->children()
-                            ->scalarNode('algorithm')
-                                ->cannotBeEmpty()
-                                ->validate()
-                                    ->ifTrue(function ($v) { return !\is_string($v); })
-                                    ->thenInvalid('You must provide a string value.')
-                                ->end()
-                            ->end()
-                            ->arrayNode('migrate_from')
-                                ->prototype('scalar')->end()
-                                ->beforeNormalization()->castToArray()->end()
-                            ->end()
-                            ->scalarNode('hash_algorithm')->info('Name of hashing algorithm for PBKDF2 (i.e. sha256, sha512, etc..) See hash_algos() for a list of supported algorithms.')->defaultValue('sha512')->end()
-                            ->scalarNode('key_length')->defaultValue(40)->end()
-                            ->booleanNode('ignore_case')->defaultFalse()->end()
-                            ->booleanNode('encode_as_base64')->defaultTrue()->end()
-                            ->scalarNode('iterations')->defaultValue(5000)->end()
-                            ->integerNode('cost')
-                                ->min(4)
-                                ->max(31)
-                                ->defaultNull()
-                            ->end()
-                            ->scalarNode('memory_cost')->defaultNull()->end()
-                            ->scalarNode('time_cost')->defaultNull()->end()
-                            ->scalarNode('id')->end()
-                        ->end()
-                    ->end()
-                ->end()
-            ->end()
-        ;
-    }
-
     private function addPasswordHashersSection(ArrayNodeDefinition $rootNode)
     {
         $rootNode