Merge branch '6.4' into 7.0

fabpot · fabpot · commit 44223f04b08e · 2023-11-26T18:09:17.000+01:00
* 6.4:
  CS: typo fix
  [Security] make secret required for DefaultLoginRateLimiter
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -860,7 +860,7 @@ private function addAssetMapperSection(ArrayNodeDefinition $rootNode, callable $
                             ->prototype('scalar')->end()
                             ->example(['*/assets/build/*', '*/*_.scss'])
                         ->end()
-                        // boolean called  defaulting to true
+                        // boolean called defaulting to true
                         ->booleanNode('exclude_dotfiles')
                             ->info('If true, any files starting with "." will be excluded from the asset mapper')
                             ->defaultTrue()
diff --git a/src/Symfony/Component/Security/Http/RateLimiter/DefaultLoginRateLimiter.php b/src/Symfony/Component/Security/Http/RateLimiter/DefaultLoginRateLimiter.php
@@ -34,7 +34,7 @@ final class DefaultLoginRateLimiter extends AbstractRequestRateLimiter
     /**
      * @param non-empty-string $secret A secret to use for hashing the IP address and username
      */
-    public function __construct(RateLimiterFactory $globalFactory, RateLimiterFactory $localFactory, #[\SensitiveParameter] string $secret = '')
+    public function __construct(RateLimiterFactory $globalFactory, RateLimiterFactory $localFactory, #[\SensitiveParameter] string $secret)
     {
         if (!$secret) {
             throw new InvalidArgumentException('A non-empty secret is required.');

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ final class DefaultLoginRateLimiter extends AbstractRequestRateLimiter`
`34`	`34`	`/**`
`35`	`35`	`* @param non-empty-string $secret A secret to use for hashing the IP address and username`
`36`	`36`	`*/`
`37`		`- public function __construct(RateLimiterFactory $globalFactory, RateLimiterFactory $localFactory, #[\SensitiveParameter] string $secret = '')`
	`37`	`+ public function __construct(RateLimiterFactory $globalFactory, RateLimiterFactory $localFactory, #[\SensitiveParameter] string $secret)`
`38`	`38`	`{`
`39`	`39`	`if (!$secret) {`
`40`	`40`	`throw new InvalidArgumentException('A non-empty secret is required.');`