Merge branch '6.0' into 6.1

* 6.0:
  Use mb_convert_encoding instead of utf8_decode
  [SecurityBundle] Remove forgotten unused code
  Minor @requires function tests cleanup
  [FrameworkBundle] Always add CacheCollectorPass
  Fix "Notice: Undefined index: headers" in messenger with Oracle
  [String] Fix ansi escape sequences regex
  Indicate support for doctrine/persistence 3
  [Routing] fix router base url when default uri has trailing slash
  Replace deprecated String.prototype.substr()

Author: derrabus

DependencyInjection/Security/Factory/RememberMeFactory.php

@@ -16,7 +16,6 @@
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
-use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -194,54 +193,6 @@ public function addConfiguration(NodeDefinition $node)
         }
     }
 
-    private function generateRememberMeServicesTemplateId(array $config, string $id): string
-    {
-        if (isset($config['service'])) {
-            return $config['service'];
-        }
-
-        if (isset($config['token_provider'])) {
-            return 'security.authentication.rememberme.services.persistent';
-        }
-
-        return 'security.authentication.rememberme.services.simplehash';
-    }
-
-    private function createRememberMeServices(ContainerBuilder $container, string $id, string $templateId, array $userProviders, array $config): void
-    {
-        $rememberMeServicesId = $templateId.'.'.$id;
-
-        $rememberMeServices = $container->setDefinition($rememberMeServicesId, new ChildDefinition($templateId));
-        $rememberMeServices->replaceArgument(1, $config['secret']);
-        $rememberMeServices->replaceArgument(2, $id);
-
-        if (isset($config['token_provider'])) {
-            $tokenProviderId = $this->createTokenProvider($container, $id, $config['token_provider']);
-            $rememberMeServices->addMethodCall('setTokenProvider', [new Reference($tokenProviderId)]);
-        }
-
-        // remember-me options
-        $mergedOptions = array_intersect_key($config, $this->options);
-        if ('auto' === $mergedOptions['secure']) {
-            $mergedOptions['secure'] = null;
-        }
-
-        $rememberMeServices->replaceArgument(3, $mergedOptions);
-
-        if ($config['user_providers']) {
-            $userProviders = [];
-            foreach ($config['user_providers'] as $providerName) {
-                $userProviders[] = new Reference('security.user.provider.concrete.'.$providerName);
-            }
-        }
-
-        if (0 === \count($userProviders)) {
-            throw new \RuntimeException('You must configure at least one remember-me aware listener (such as form-login) for each firewall that has remember-me enabled.');
-        }
-
-        $rememberMeServices->replaceArgument(0, new IteratorArgument(array_unique($userProviders)));
-    }
-
     private function createTokenProvider(ContainerBuilder $container, string $firewallName, array $config): string
     {
         $tokenProviderId = $config['service'] ?? false;