Merge pull request #3 from docteurklein/configure_converters

fixed third argument of registerConverter
chanmix51 · Dec 3, 2011 · 50f6175 · 50f6175
2 parents 2f6a900 + fd536fe
commit 50f6175
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -44,8 +44,14 @@ public function getConfigTreeBuilder()
                             ->scalarNode('class')->defaultValue('Pomm\Connection\Database')->end()
                             ->scalarNode('isolation')->defaultNull()->end()
                             ->arrayNode('converters')
-                                ->useAttributeAsKey('class')
-                                ->prototype('scalar')->end()
+                                ->useAttributeAsKey('key')
+                                ->prototype('array')
+                                    ->children()
+                                        ->scalarNode('class')->isRequired()->end()
+                                        ->arrayNode('types')->isRequired()->prototype('scalar')->end()
+                                        ->end()
+                                    ->end()
+                                ->end()
                             ->end()
                         ->end()
                     ->end()

diff --git a/DependencyInjection/GHubPommExtension.php b/DependencyInjection/GHubPommExtension.php
@@ -33,8 +33,9 @@ public function load(array $configs, ContainerBuilder $container)
                 $id,
                 new Definition($parameters['class'], array($parameters))
             );
-            foreach ($parameters['converters'] as $type => $converterClass) {
-                $databaseDefinition->addMethodCall('registerConverter', array($type, new Definition($converterClass)));
+            foreach ($parameters['converters'] as $type => $converter) {
+                $converterDefinition = new Definition($converter['class']);
+                $databaseDefinition->addMethodCall('registerConverter', array($type, $converterDefinition, $converter['types']));
             }
             $container->getDefinition('pomm')->addMethodCall('setDatabase', array($name, new Reference($id)));
         }

diff --git a/README.rst b/README.rst
@@ -96,13 +96,19 @@ You can define global converter definitions for all databases, and/or per databa
     #app/config/config.yml
     pomm:
         converters:
-           year: My\Pomm\Converter\Year
-           month: My\Pomm\Converter\Month
+            year: 
+                class: My\Pomm\Converter\Year
+                types: [year]
+            month: 
+                class: My\Pomm\Converter\Month
+                types: [month]
         databases:
             con1:
                 dsn:       pgsql://user:password@host:port/dbname
                 converters:
-                   day: My\Pomm\Converter\Day
+                    day: 
+                        class: My\Pomm\Converter\Day
+                        types: [day]
             con2:
                 dsn:       pgsql://user:password@host:port/dbname
                 class:     My/Database    # default: Pomm\Connection\Database