Skip to content

Commit ff1f851

Browse files
Merge branch '6.1' into 6.2
* 6.1: [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 [FrameworkBundle] Removed unused $willBeAvailable params on Configuration [Cache] Remove extra type condition in MemcachedAdapter::createConnection() Tell about messenger:consume invalid limit options [Messenger] Do not throw 'no handlers' exception when skipping due to duplicate handling
2 parents 7774fad + bd53c17 commit ff1f851

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

DependencyInjection/Configuration.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ public function getConfigTreeBuilder(): TreeBuilder
161161
$this->addRequestSection($rootNode);
162162
$this->addAssetsSection($rootNode, $enableIfStandalone);
163163
$this->addTranslatorSection($rootNode, $enableIfStandalone);
164-
$this->addValidationSection($rootNode, $enableIfStandalone, $willBeAvailable);
164+
$this->addValidationSection($rootNode, $enableIfStandalone);
165165
$this->addAnnotationsSection($rootNode, $willBeAvailable);
166-
$this->addSerializerSection($rootNode, $enableIfStandalone, $willBeAvailable);
166+
$this->addSerializerSection($rootNode, $enableIfStandalone);
167167
$this->addPropertyAccessSection($rootNode, $willBeAvailable);
168168
$this->addPropertyInfoSection($rootNode, $enableIfStandalone);
169169
$this->addCacheSection($rootNode, $willBeAvailable);
@@ -872,7 +872,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
872872
;
873873
}
874874

875-
private function addValidationSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone, callable $willBeAvailable)
875+
private function addValidationSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
876876
{
877877
$rootNode
878878
->children()
@@ -982,7 +982,7 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $
982982
;
983983
}
984984

985-
private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone, callable $willBeAvailable)
985+
private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
986986
{
987987
$rootNode
988988
->children()
@@ -1116,7 +1116,7 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
11161116
->booleanNode('public')->defaultFalse()->end()
11171117
->scalarNode('default_lifetime')
11181118
->info('Default lifetime of the pool')
1119-
->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')
1119+
->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')
11201120
->end()
11211121
->scalarNode('provider')
11221122
->info('Overwrite the setting from the default provider for this adapter.')

0 commit comments

Comments
 (0)