bug #60322 [FrameworkBundle] drop the limiters option for non-compound rater limiters (xabbuh)

fabpot · fabpot · commit 5dd87d28d40b · 2025-05-03T09:57:07.000+02:00
This PR was merged into the 7.3 branch. Discussion ---------- [FrameworkBundle] drop the limiters option for non-compound rater limiters | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #60306 | License | MIT Commits ------- 406e68a drop the limiters option for non-compound rater limiters
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -3255,6 +3255,8 @@ private function registerRateLimiterConfiguration(array $config, ContainerBuilde
                 continue;
             }
 
+            unset($limiterConfig['limiters']);
+
             $limiters[] = $name;
 
             // default configuration (when used by other DI extensions)
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/PhpFrameworkExtensionTest.php
@@ -314,6 +314,19 @@ public function testRateLimiterCompoundPolicy()
             ]);
         });
 
+        $this->assertSame([
+            'policy' => 'fixed_window',
+            'limit' => 10,
+            'interval' => '1 hour',
+            'id' => 'first',
+        ], $container->getDefinition('limiter.first')->getArgument(0));
+        $this->assertSame([
+            'policy' => 'sliding_window',
+            'limit' => 10,
+            'interval' => '1 hour',
+            'id' => 'second',
+        ], $container->getDefinition('limiter.second')->getArgument(0));
+
         $definition = $container->getDefinition('limiter.compound');
         $this->assertSame(CompoundRateLimiterFactory::class, $definition->getClass());
         $this->assertEquals(

Original file line number	Diff line number	Diff line change
`@@ -3255,6 +3255,8 @@ private function registerRateLimiterConfiguration(array $config, ContainerBuilde`
`3255`	`3255`	`continue;`
`3256`	`3256`	`}`
`3257`	`3257`
	`3258`	`+ unset($limiterConfig['limiters']);`
	`3259`	`+`
`3258`	`3260`	`$limiters[] = $name;`
`3259`	`3261`
`3260`	`3262`	`// default configuration (when used by other DI extensions)`