Update existing generators

Author: Robin Cawser

spec/Vivait/StringGeneratorBundle/EventListener/GeneratorListenerSpec.php

@@ -15,6 +15,7 @@
 use Vivait\StringGeneratorBundle\Annotation\GeneratorAnnotation;
 use Vivait\StringGeneratorBundle\Generator\StringGenerator;
 use Vivait\StringGeneratorBundle\Model\ConfigurableGeneratorInterface;
+use Vivait\StringGeneratorBundle\Model\GeneratorInterface;
 use Vivait\StringGeneratorBundle\Registry\Registry;
 
 class GeneratorListenerSpec extends ObjectBehavior
@@ -60,7 +61,7 @@ function it_can_get_callback_values_from_annotated_object(StringGenerator $gener
         $this->performCallbacks($generator, $annotation, $this->mockEntity);
     }
 
-    function it_sets_null_properties_if_override_set_to_true(Registry $registry, Reader $reader, LifecycleEventArgs $args, StringGenerator $generator)
+    function it_sets_null_properties_if_override_set_to_true(Registry $registry, Reader $reader, LifecycleEventArgs $args, GeneratorInterface $generator)
     {
         $annotation = new GeneratorAnnotation([]);
         $annotation->override = false;
@@ -74,7 +75,7 @@ function it_sets_null_properties_if_override_set_to_true(Registry $registry, Rea
 
         $this->prePersist($args);
     }
-    function it_wont_set_non_null_properties_if_override_set_to_true(Reader $reader, LifecycleEventArgs $args, StringGenerator $generator)
+    function it_wont_set_non_null_properties_if_override_set_to_true(Reader $reader, LifecycleEventArgs $args, GeneratorInterface $generator)
     {
         $this->mockEntity->setName('Robin');
         $annotation = new GeneratorAnnotation([]);
@@ -86,7 +87,7 @@ function it_wont_set_non_null_properties_if_override_set_to_true(Reader $reader,
         $this->prePersist($args);
     }
 
-    function it_generates_a_string_on_a_property(Registry $registry, Reader $reader, LifecycleEventArgs $args, StringGenerator $generator)
+    function it_generates_a_string_on_a_property(Registry $registry, Reader $reader, LifecycleEventArgs $args, GeneratorInterface $generator)
     {
         $annotation = new GeneratorAnnotation([]);
 

spec/Vivait/StringGeneratorBundle/Generator/StringGeneratorSpec.php

@@ -18,20 +18,6 @@ function it_generates_a_string_based_on_length()
         $this->generate()->shouldHaveStrlen(10);
     }
 
-    function it_should_throw_an_exception_if_it_has_no_chars()
-    {
-        $this->shouldThrow('\OutOfBoundsException')->duringSetChars('');
-        $this->shouldThrow('\OutOfBoundsException')->duringSetChars(null);
-        $this->shouldThrow('\OutOfBoundsException')->duringSetChars(true);
-    }
-
-    function it_should_error_if_its_length_is_set_to_less_than_1()
-    {
-        $this->shouldThrow('\OutOfBoundsException')->duringSetLength(0);
-        $this->shouldThrow('\OutOfBoundsException')->duringSetLength(-1);
-        $this->shouldThrow('\OutOfBoundsException')->duringSetLength("ten");
-    }
-
     function getMatchers()
     {
         return [

src/Vivait/StringGeneratorBundle/Generator/SecureBytesGenerator.php

@@ -2,10 +2,11 @@
 
 namespace Vivait\StringGeneratorBundle\Generator;
 
+use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Security\Core\Util\SecureRandom;
-use Vivait\StringGeneratorBundle\Model\GeneratorInterface;
+use Vivait\StringGeneratorBundle\Model\ConfigurableGeneratorInterface;
 
-class SecureBytesGenerator implements GeneratorInterface
+class SecureBytesGenerator implements ConfigurableGeneratorInterface
 {
     /**
      * @var SecureRandom
@@ -28,7 +29,6 @@ public function __construct(SecureRandom $secureRandom)
     public function setLength($length)
     {
         $this->length = $length;
-        return $this;
     }
 
     /**
@@ -39,11 +39,23 @@ public function generate()
         return $this->secureRandom->nextBytes($this->length);
     }
 
+    /**
+     * @param OptionsResolver $resolver
+     * @return mixed
+     */
+    public function getDefaultOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'length' => $this->length,
+            ]);
+    }
+
     /**
      * @param array $options
+     * @return mixed
      */
     public function setOptions(array $options)
     {
-        // TODO: Implement setOptions() method.
+        $this->length = $options['length'];
     }
 }

src/Vivait/StringGeneratorBundle/Generator/SecureStringGenerator.php

@@ -63,7 +63,7 @@ public function getGenerator($strength = 'medium')
         }
     }
 
-    public function setOptions(array $options = [])
+    public function setOptions(array $options)
     {
         $this->generator = $this->getGenerator($options['strength']);
         $this->length = $options['length'];

src/Vivait/StringGeneratorBundle/Generator/StringGenerator.php

@@ -2,9 +2,10 @@
 
 namespace Vivait\StringGeneratorBundle\Generator;
 
-use Vivait\StringGeneratorBundle\Model\GeneratorInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Vivait\StringGeneratorBundle\Model\ConfigurableGeneratorInterface;
 
-class StringGenerator implements GeneratorInterface
+class StringGenerator implements ConfigurableGeneratorInterface
 {
 
     /**
@@ -16,10 +17,15 @@ class StringGenerator implements GeneratorInterface
      * @var string
      */
     private $chars = 'abcdefjhijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ12345567890';
+
+    /**
+     * @var string
+     */
     private $prefix = '';
 
     /**
      * @param string $chars
+     * @deprecated options should be used instead
      */
     public function setChars($chars)
     {
@@ -37,14 +43,13 @@ public function setChars($chars)
      */
     public function setLength($length)
     {
-        if ($length < 1) {
-            throw new \OutOfBoundsException('Length must be greater than 0');
-        }
-
         $this->length = $length;
-        return $this;
     }
 
+    /**
+     * @param $prefix
+     * @deprecated options should be used instead
+     */
     public function setPrefix($prefix)
     {
         $this->prefix = $prefix;
@@ -69,9 +74,25 @@ public function generate()
 
     /**
      * @param array $options
+     * @return mixed|void
      */
     public function setOptions(array $options)
     {
-        // TODO: Implement setOptions() method.
+        $this->chars = $options['chars'];
+        $this->length = $options['length'];
+        $this->prefix = $options['prefix'];
+    }
+
+    /**
+     * @param OptionsResolver $resolver
+     * @return mixed
+     */
+    public function getDefaultOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+                'chars' => $this->chars,
+                'length' => $this->length,
+                'prefix' => $this->prefix,
+            ]);
     }
 }

src/Vivait/StringGeneratorBundle/Model/ConfigurableGeneratorInterface.php

@@ -10,7 +10,7 @@ interface ConfigurableGeneratorInterface extends GeneratorInterface
      * @param array $options
      * @return mixed
      */
-    public function setOptions(array $options = []);
+    public function setOptions(array $options);
 
     /**
      * @param OptionsResolver $resolver