Merge remote-tracking branch 'remotes/origin/master' into 5.2

Author: Simonas Šerlinskas

DependencyInjection/Configuration.php

@@ -60,7 +60,7 @@ private function getAnalysisNode()
         $node = $builder->root('analysis');
 
         $node
-            ->info('Defines analyzers, tokenizers and filters')
+            ->info('Defines analyzers, normalizers, tokenizers and filters')
             ->addDefaultsIfNotSet()
             ->children()
                 ->arrayNode('tokenizer')
@@ -75,6 +75,10 @@ private function getAnalysisNode()
                     ->defaultValue([])
                     ->prototype('variable')->end()
                 ->end()
+                ->arrayNode('normalizer')
+                    ->defaultValue([])
+                    ->prototype('variable')->end()
+                ->end()
                 ->arrayNode('char_filter')
                     ->defaultValue([])
                     ->prototype('variable')->end()

Mapping/MetadataCollector.php

@@ -251,6 +251,7 @@ public function getClientAnalysis(array $bundles, $analysisConfig = [])
             'filter' => [],
             'tokenizer' => [],
             'char_filter' => [],
+            'normalizer' => [],
         ];
 
         /** @var array $mappings All mapping info */
@@ -283,6 +284,10 @@ public function getClientAnalysis(array $bundles, $analysisConfig = [])
             }
         }
 
+        if (isset($analysisConfig['normalizer'])) {
+            $typesAnalysis['normalizer'] = $analysisConfig['normalizer'];
+        }
+
         $this->enableCache && $this->cache->save($cacheName, $typesAnalysis);
 
         return $typesAnalysis;