Merge pull request #29 from pavelgopanenko/master

"unique" and "optional" formatter options
willdurand · Feb 19, 2014 · adead45 · adead45
2 parents 626531e + adde379
commit adead45
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/DependencyInjection/BazingaFakerExtension.php b/DependencyInjection/BazingaFakerExtension.php
@@ -125,13 +125,15 @@ public function load(array $configs, ContainerBuilder $container)
                 foreach ($params['custom_formatters'] as $column => $formatter) {
                     $method = $formatter['method'];
                     $parameters = $formatter['parameters'];
+                    $unique = $formatter['unique'];
+                    $optional = $formatter['optional'];
 
                     if (null === $method) {
                         $formatters[$column] = null;
                     } else {
                         $container->setDefinition('faker.entities.' . $i . '.formatters.' . $j, new Definition(
                             'closure',
-                            array(new Reference('faker.generator'), $method, $parameters)
+                            array(new Reference('faker.generator'), $method, $parameters, $unique, $optional)
                         ))->setFactoryService(
                             'faker.formatter_factory'
                         )->setFactoryMethod(

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -65,6 +65,8 @@ public function getConfigTreeBuilder()
                                 ->arrayNode('parameters')
                                     ->prototype('variable')->end()
                                 ->end()
+                                ->booleanNode('unique')->defaultFalse()->end()
+                                ->scalarNode('optional')->defaultNull()->end()
                             ->end()
                         ->end()->end()
                         ->arrayNode('custom_modifiers')

diff --git a/Factory/FormatterFactory.php b/Factory/FormatterFactory.php
@@ -10,13 +10,23 @@
 
 namespace Bazinga\Bundle\FakerBundle\Factory;
 
+use Faker\Generator;
+
 /**
  * @author William Durand <[email protected]>
  */
 class FormatterFactory
 {
-    public static function createClosure($generator, $method, array $parameters = array())
+    public static function createClosure($generator, $method, array $parameters = array(), $unique = false, $optional = null)
     {
+        if ($unique && $generator instanceof Generator) {
+            $generator = $generator->unique();
+        }
+
+        if (null !== $optional && $generator instanceof Generator) {
+            $generator = $generator->optional((double) $optional);
+        }
+
         if (0 === count($parameters)) {
             return function () use ($generator, $method) { return $generator->$method(); };
         }