Moved hydrators configuration in entity manager

src/Symfony/Bundle/DoctrineBundle/DependencyInjection/Configuration.php

@@ -132,18 +132,6 @@ class Configuration
                         ->scalarNode('proxy_dir')->defaultValue('%kernel.cache_dir%/doctrine/orm/Proxies')->end()
                         ->scalarNode('proxy_namespace')->defaultValue('Proxies')->end()
                     ->end()
-                    ->fixXmlConfig('hydrator')
-                    ->children()
-                        ->arrayNode('hydrators')
-                            ->useAttributeAsKey('name')
-                            ->prototype('scalar')
-                                ->beforeNormalization()
-                                    ->ifTrue(function($v) { return is_array($v) && isset($v['class']); })
-                                    ->then(function($v) { return $v['class']; })
-                                ->end()
-                            ->end()
-                        ->end()
-                    ->end()
                     ->fixXmlConfig('entity_manager')
                     ->append($this->getOrmEntityManagersNode())
                 ->end()
@@ -168,6 +156,18 @@ class Configuration
                     ->scalarNode('connection')->end()
                     ->scalarNode('class_metadata_factory_name')->defaultValue('%doctrine.orm.class_metadata_factory_name%')->end()
                 ->end()
+                ->fixXmlConfig('hydrator')
+                ->children()
+                    ->arrayNode('hydrators')
+                        ->useAttributeAsKey('name')
+                        ->prototype('scalar')
+                            ->beforeNormalization()
+                                ->ifTrue(function($v) { return is_array($v) && isset($v['class']); })
+                                ->then(function($v) { return $v['class']; })
+                            ->end()
+                        ->end()
+                    ->end()
+                ->end()
                 ->fixXmlConfig('mapping')
                 ->children()
                     ->arrayNode('mappings')

src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php

@@ -151,7 +151,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
             $config['default_entity_manager'] = reset($entityManagers);
         }
 
-        $options = array('default_entity_manager', 'auto_generate_proxy_classes', 'proxy_dir', 'proxy_namespace', 'hydrators');
+        $options = array('default_entity_manager', 'auto_generate_proxy_classes', 'proxy_dir', 'proxy_namespace');
         foreach ($options as $key) {
             $container->setParameter('doctrine.orm.'.$key, $config[$key]);
         }
@@ -197,7 +197,7 @@ class DoctrineExtension extends AbstractDoctrineExtension
             $ormConfigDef->addMethodCall($method, array($arg));
         }
 
-        foreach ($container->getParameter('doctrine.orm.hydrators') as $name => $class) {
+        foreach ($entityManager['hydrators'] as $name => $class) {
             $ormConfigDef->addMethodCall('addCustomHydrationMode', array ($name, $class));
         }