Merge branch '6.4' into 7.2

fabpot · fabpot · commit d58ebcd726c0 · 2025-05-10T13:58:55.000+02:00
* 6.4:
  Improve readability of disallow_search_engine_index condition
  [Security] Avoid failing when PersistentRememberMeHandler handles a malformed cookie
  [DoctrineBridge] Undefined variable
diff --git a/DependencyInjection/FrameworkExtension.php b/DependencyInjection/FrameworkExtension.php
@@ -731,7 +731,7 @@ static function (ChildDefinition $definition, AsPeriodicTask|AsCronTask $attribu
             $container->getDefinition('config_cache_factory')->setArguments([]);
         }
 
-        if (!$config['disallow_search_engine_index'] ?? false) {
+        if (!$config['disallow_search_engine_index']) {
             $container->removeDefinition('disallow_search_engine_index_response_listener');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -731,7 +731,7 @@ static function (ChildDefinition $definition, AsPeriodicTask\|AsCronTask $attribu`
`731`	`731`	`$container->getDefinition('config_cache_factory')->setArguments([]);`
`732`	`732`	`}`
`733`	`733`
`734`		`- if (!$config['disallow_search_engine_index'] ?? false) {`
	`734`	`+ if (!$config['disallow_search_engine_index']) {`
`735`	`735`	`$container->removeDefinition('disallow_search_engine_index_response_listener');`
`736`	`736`	`}`
`737`	`737`