bug #59930 [FrameworkBundle] fix autowiring RateLimiterFactoryInterface (kbond)

chalasr · chalasr · commit 9fb2ba281ad5 · 2025-03-07T21:06:22.000+01:00
This PR was merged into the 7.3 branch. Discussion ---------- [FrameworkBundle] fix autowiring `RateLimiterFactoryInterface` | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix bug in #58939 | License | MIT Fixes a small bug from #58939. Confirmed with `@alexandre`-daubois this was the intention. Commits ------- 7130a9f [FrameworkBundle] fix autowiring `RateLimiterFactoryInterface`
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -9,7 +9,7 @@ CHANGELOG
  * Add JsonStreamer services and configuration
  * Add new `framework.property_info.with_constructor_extractor` option to allow enabling or disabling the constructor extractor integration
  * Deprecate the `--show-arguments` option of the `container:debug` command, as arguments are now always shown
- * Add `RateLimiterFactoryInterface` as an alias of the `limiter` service
+ * Add autowiring alias for `RateLimiterFactoryInterface`
  * Add `framework.validation.disable_translation` option
  * Add support for signal plain name in the `messenger.stop_worker_on_signals` configuration
  * Deprecate the `framework.validation.cache` option
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -151,6 +151,7 @@
 use Symfony\Component\PropertyInfo\PropertyTypeExtractorInterface;
 use Symfony\Component\RateLimiter\LimiterInterface;
 use Symfony\Component\RateLimiter\RateLimiterFactory;
+use Symfony\Component\RateLimiter\RateLimiterFactoryInterface;
 use Symfony\Component\RateLimiter\Storage\CacheStorage;
 use Symfony\Component\RemoteEvent\Attribute\AsRemoteEventConsumer;
 use Symfony\Component\RemoteEvent\RemoteEvent;
@@ -3201,6 +3202,10 @@ private function registerRateLimiterConfiguration(array $config, ContainerBuilde
             $limiter->replaceArgument(0, $limiterConfig);
 
             $container->registerAliasForArgument($limiterId, RateLimiterFactory::class, $name.'.limiter');
+
+            if (interface_exists(RateLimiterFactoryInterface::class)) {
+                $container->registerAliasForArgument($limiterId, RateLimiterFactoryInterface::class, $name.'.limiter');
+            }
         }
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/rate_limiter.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/rate_limiter.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\RateLimiter\RateLimiterFactory;
-use Symfony\Component\RateLimiter\RateLimiterFactoryInterface;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
@@ -28,9 +27,4 @@
                 null,
             ])
     ;
-
-    if (interface_exists(RateLimiterFactoryInterface::class)) {
-        $container->services()
-            ->alias(RateLimiterFactoryInterface::class, 'limiter');
-    }
 };
