[FrameworkBundle] Fix cache pool configuration with one adapter and one provider

fancyweb · fancyweb · commit 2261d82f9cfb · 2021-09-24T14:47:56.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1012,14 +1012,22 @@ private function addCacheSection(ArrayNodeDefinition $rootNode)
                             ->prototype('array')
                                 ->fixXmlConfig('adapter')
                                 ->beforeNormalization()
-                                    ->ifTrue(function ($v) { return (isset($v['adapters']) || \is_array($v['adapter'] ?? null)) && isset($v['provider']); })
+                                    ->ifTrue(function ($v) { return \is_array($v['adapter'] ?? null) && isset($v['provider']); })
                                     ->thenInvalid('Pool cannot have a "provider" while "adapter" is set to a map')
                                 ->end()
+                                ->beforeNormalization()
+                                    ->ifTrue(function ($v) { return \is_array($v['adapters'] ?? null) && 1 < \count($v['adapters']) && isset($v['provider']); })
+                                    ->thenInvalid('Pool cannot have a "provider" while "adapters" contains more than one value')
+                                ->end()
                                 ->children()
                                     ->arrayNode('adapters')
                                         ->performNoDeepMerging()
                                         ->info('One or more adapters to chain for creating the pool, defaults to "cache.app".')
                                         ->beforeNormalization()
+                                            ->beforeNormalization()
+                                                ->ifTrue(function ($v) { return !\is_array($v); })
+                                                ->thenInvalid('Pool "adapters" must be a map')
+                                            ->end()
                                             ->always()->then(function ($values) {
                                                 if ([0] === array_keys($values) && \is_array($values[0])) {
                                                     return $values[0];
