Skip to content

Commit bd53c17

Browse files
Merge branch '6.0' into 6.1
* 6.0: [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 d25702a + 9d220b0 commit bd53c17

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
@@ -160,9 +160,9 @@ public function getConfigTreeBuilder(): TreeBuilder
160160
$this->addRequestSection($rootNode);
161161
$this->addAssetsSection($rootNode, $enableIfStandalone);
162162
$this->addTranslatorSection($rootNode, $enableIfStandalone);
163-
$this->addValidationSection($rootNode, $enableIfStandalone, $willBeAvailable);
163+
$this->addValidationSection($rootNode, $enableIfStandalone);
164164
$this->addAnnotationsSection($rootNode, $willBeAvailable);
165-
$this->addSerializerSection($rootNode, $enableIfStandalone, $willBeAvailable);
165+
$this->addSerializerSection($rootNode, $enableIfStandalone);
166166
$this->addPropertyAccessSection($rootNode, $willBeAvailable);
167167
$this->addPropertyInfoSection($rootNode, $enableIfStandalone);
168168
$this->addCacheSection($rootNode, $willBeAvailable);
@@ -868,7 +868,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode, callable $e
868868
;
869869
}
870870

871-
private function addValidationSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone, callable $willBeAvailable)
871+
private function addValidationSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
872872
{
873873
$rootNode
874874
->children()
@@ -978,7 +978,7 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode, callable $
978978
;
979979
}
980980

981-
private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone, callable $willBeAvailable)
981+
private function addSerializerSection(ArrayNodeDefinition $rootNode, callable $enableIfStandalone)
982982
{
983983
$rootNode
984984
->children()
@@ -1112,7 +1112,7 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
11121112
->booleanNode('public')->defaultFalse()->end()
11131113
->scalarNode('default_lifetime')
11141114
->info('Default lifetime of the pool')
1115-
->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')
1115+
->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')
11161116
->end()
11171117
->scalarNode('provider')
11181118
->info('Overwrite the setting from the default provider for this adapter.')

0 commit comments

Comments
 (0)