Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 9d220b025ddb · 2022-11-14T11:09:52.000+01:00
* 5.4:
  [Messenger] cs fix
  [Messenger] Fix time-limit check exception
  [Console] Fix console `ProgressBar::override()` after manual `ProgressBar::cleanup()`
  [FrameworkBundle] typo default_lifetime example
  [HttpClient] Handle Amp HTTP client v5 incompatibility gracefully
  [HttpKernel] Don’t try to wire Response argument with controller.service_arguments
  [PhpUnitBridge] Fix language deprecations incorrectly marked as direct
  Tell about messenger:consume invalid limit options
  [Messenger] Do not throw 'no handlers' exception when skipping due to duplicate handling
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -1092,7 +1092,7 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
                                     ->booleanNode('public')->defaultFalse()->end()
                                     ->scalarNode('default_lifetime')
                                         ->info('Default lifetime of the pool')
-                                        ->example('"600" for 5 minutes expressed in seconds, "PT5M" for five minutes expressed as ISO 8601 time interval, or "5 minutes" as a date expression')
+                                        ->example('"300" for 5 minutes expressed in seconds, "PT5M" for five minutes expressed as ISO 8601 time interval, or "5 minutes" as a date expression')
                                     ->end()
                                     ->scalarNode('provider')
                                         ->info('Overwrite the setting from the default provider for this adapter.')
