Renamed Limiter to RateLimiter

Relates to symfony#37546 (comment)

I'm still not sure about a factory class that is called "Limiter", as it
doesn't implement the "LimiterInterface" and doesn't represent a limiter.

Author: wouterj

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -128,8 +128,8 @@
 use Symfony\Component\PropertyInfo\PropertyReadInfoExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 use Symfony\Component\PropertyInfo\PropertyWriteInfoExtractorInterface;
-use Symfony\Component\RateLimiter\Limiter;
 use Symfony\Component\RateLimiter\LimiterInterface;
+use Symfony\Component\RateLimiter\RateLimiter;
 use Symfony\Component\RateLimiter\Storage\CacheStorage;
 use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
 use Symfony\Component\Routing\Loader\AnnotationFileLoader;
@@ -2266,7 +2266,7 @@ public static function registerRateLimiter(ContainerBuilder $container, string $
         $limiterConfig['id'] = $name;
         $limiter->replaceArgument(0, $limiterConfig);
 
-        $container->registerAliasForArgument($limiterId, Limiter::class, $name.'.limiter');
+        $container->registerAliasForArgument($limiterId, RateLimiter::class, $name.'.limiter');
     }
 
     private function resolveTrustedHeaders(array $headers): int

src/Symfony/Bundle/FrameworkBundle/Resources/config/rate_limiter.php

@@ -11,15 +11,15 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-use Symfony\Component\RateLimiter\Limiter;
+use Symfony\Component\RateLimiter\RateLimiter;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('cache.rate_limiter')
             ->parent('cache.app')
             ->tag('cache.pool')
 
-        ->set('limiter', Limiter::class)
+        ->set('limiter', RateLimiter::class)
             ->abstract()
             ->args([
                 abstract_arg('config'),

src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/LoginThrottlingFactory.php

@@ -18,7 +18,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpFoundation\RateLimiter\RequestRateLimiterInterface;
-use Symfony\Component\RateLimiter\Limiter;
+use Symfony\Component\RateLimiter\RateLimiter;
 use Symfony\Component\Security\Http\EventListener\LoginThrottlingListener;
 use Symfony\Component\Security\Http\RateLimiter\DefaultLoginRateLimiter;
 
@@ -63,7 +63,7 @@ public function createAuthenticator(ContainerBuilder $container, string $firewal
             throw new \LogicException('Login throttling requires symfony/security-http:^5.2.');
         }
 
-        if (!class_exists(Limiter::class)) {
+        if (!class_exists(RateLimiter::class)) {
             throw new \LogicException('Login throttling requires symfony/rate-limiter to be installed and enabled.');
         }
 

src/Symfony/Component/RateLimiter/README.md

@@ -18,9 +18,9 @@ $ composer require symfony/rate-limiter
 
 ```php
 use Symfony\Component\RateLimiter\Storage\InMemoryStorage;
-use Symfony\Component\RateLimiter\Limiter;
+use Symfony\Component\RateLimiter\RateLimiter;
 
-$limiter = new Limiter([
+$limiter = new RateLimiter([
     'id' => 'login',
     'strategy' => 'token_bucket', // or 'fixed_window'
     'limit' => 10,

…ymfony/Component/RateLimiter/Limiter.php …ny/Component/RateLimiter/RateLimiter.phpsrc/Symfony/Component/RateLimiter/Limiter.php renamed to src/Symfony/Component/RateLimiter/RateLimiter.php src/Symfony/Component/RateLimiter/Limiter.php renamed to src/Symfony/Component/RateLimiter/RateLimiter.php

@@ -22,7 +22,7 @@
  *
  * @experimental in 5.2
  */
-final class Limiter
+final class RateLimiter
 {
     private $config;
     private $storage;

src/Symfony/Component/RateLimiter/Tests/LimiterTest.php

@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Lock\LockFactory;
 use Symfony\Component\RateLimiter\FixedWindowLimiter;
-use Symfony\Component\RateLimiter\Limiter;
+use Symfony\Component\RateLimiter\RateLimiter;
 use Symfony\Component\RateLimiter\Storage\StorageInterface;
 use Symfony\Component\RateLimiter\TokenBucketLimiter;
 
@@ -61,6 +61,6 @@ public function testWrongInterval()
 
     private function createFactory(array $options)
     {
-        return new Limiter($options, $this->createMock(StorageInterface::class), $this->createMock(LockFactory::class));
+        return new RateLimiter($options, $this->createMock(StorageInterface::class), $this->createMock(LockFactory::class));
     }
 }

src/Symfony/Component/Security/Http/RateLimiter/DefaultLoginRateLimiter.php

@@ -13,7 +13,7 @@
 
 use Symfony\Component\HttpFoundation\RateLimiter\AbstractRequestRateLimiter;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\RateLimiter\Limiter;
+use Symfony\Component\RateLimiter\RateLimiter;
 use Symfony\Component\Security\Core\Security;
 
 /**
@@ -31,7 +31,7 @@ final class DefaultLoginRateLimiter extends AbstractRequestRateLimiter
     private $globalLimiter;
     private $localLimiter;
 
-    public function __construct(Limiter $globalLimiter, Limiter $localLimiter)
+    public function __construct(RateLimiter $globalLimiter, RateLimiter $localLimiter)
     {
         $this->globalLimiter = $globalLimiter;
         $this->localLimiter = $localLimiter;

src/Symfony/Component/Security/Http/Tests/EventListener/LoginThrottlingListenerTest.php

@@ -14,7 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
-use Symfony\Component\RateLimiter\Limiter;
+use Symfony\Component\RateLimiter\RateLimiter;
 use Symfony\Component\RateLimiter\Storage\InMemoryStorage;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\TooManyLoginAttemptsAuthenticationException;
@@ -35,13 +35,13 @@ protected function setUp(): void
     {
         $this->requestStack = new RequestStack();
 
-        $localLimiter = new Limiter([
+        $localLimiter = new RateLimiter([
             'id' => 'login',
             'strategy' => 'fixed_window',
             'limit' => 3,
             'interval' => '1 minute',
         ], new InMemoryStorage());
-        $globalLimiter = new Limiter([
+        $globalLimiter = new RateLimiter([
             'id' => 'login',
             'strategy' => 'fixed_window',
             'limit' => 6,