Skip to content

Commit c22492b

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: [HttpClient] Don't ignore errors from curl_multi_exec() [HttpClient] Double check if handle is complete CI for macOS [DependencyInjection] Resolve ChildDefinition in AbstractRecursivePass [Process] fixed uppercase ARGC and ARGV should also be skipped [FrameworkBundle] Fix cache pool configuration with one adapter and one provider Missing translations for Belarusian (be) #41032
2 parents 89f9dc7 + 35ca5bd commit c22492b

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

DependencyInjection/Configuration.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,13 +1052,14 @@ private function addCacheSection(ArrayNodeDefinition $rootNode, callable $willBe
10521052
->prototype('array')
10531053
->fixXmlConfig('adapter')
10541054
->beforeNormalization()
1055-
->ifTrue(function ($v) { return (isset($v['adapters']) || \is_array($v['adapter'] ?? null)) && isset($v['provider']); })
1056-
->thenInvalid('Pool cannot have a "provider" while "adapter" is set to a map')
1055+
->ifTrue(function ($v) { return isset($v['provider']) && \is_array($v['adapters'] ?? $v['adapter'] ?? null) && 1 < \count($v['adapters'] ?? $v['adapter']); })
1056+
->thenInvalid('Pool cannot have a "provider" while more than one adapter is defined')
10571057
->end()
10581058
->children()
10591059
->arrayNode('adapters')
10601060
->performNoDeepMerging()
10611061
->info('One or more adapters to chain for creating the pool, defaults to "cache.app".')
1062+
->beforeNormalization()->castToArray()->end()
10621063
->beforeNormalization()
10631064
->always()->then(function ($values) {
10641065
if ([0] === array_keys($values) && \is_array($values[0])) {

0 commit comments

Comments
 (0)