Merge pull request #23 from robcaw/develop

Update default chars for generators

Author: rcwsr

README.md

@@ -40,23 +40,22 @@ vivait_string_generator:
 Generates a random string based on a pool or characters. Defaults:
 
 ```php
-@Generate(generator="string", options={"length"=8, "chars"="abcdefjhijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ12345567890", "prefix"=""})
+@Generate(generator="string", options={"length"=8, "chars"="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", "prefix"=""})
 ```
 
-
-### `SecureBytesGenerator`
-Generates a secure random byte string using the `Symfony\Component\Security\Core\Util\SecureRandom` class. Defaults:
+### `SecureStringGenerator`
+Generates a secure random string using [ircmaxell's RandomLib](https://github.com/ircmaxell/RandomLib). The library provides three different strengths of
+strings(currently `high` is unavailable), `low` and `medium`. Defaults:
 
 ```php
-@Generate(generator="secure_bytes", options={"length"=8})
+@Generate(generator="secure_string", options={"length"=32, "chars"="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", "strength"="medium"})
 ```
 
-### `SecureStringGenerator`
-Generates a secure random string using [ircmaxell's RandomLib](https://github.com/ircmaxell/RandomLib). The library provides three different strengths of
-strings(currently `high` is unavailable), `low` and `medium`. Defaults:
+### `SecureBytesGenerator`
+Generates a secure random byte string using the `Symfony\Component\Security\Core\Util\SecureRandom` class. Defaults:
 
 ```php
-@Generate(generator="secure_string", options={"length"=32, "chars"="", "strength"="medium"})
+@Generate(generator="secure_bytes", options={"length"=8})
 ```
 
 ## Usage

spec/Vivait/StringGeneratorBundle/Generator/SecureStringGeneratorSpec.php

@@ -30,7 +30,7 @@ function let(Factory $factory, Generator $low, Generator $medium)
 
         $defaults = [
             'length' => 32,
-            'chars' => '',
+            'chars' => '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ',
             'strength' => 'medium',
         ];
 
@@ -59,7 +59,7 @@ function it_errors_on_invalid_strength_gen(Generator $medium, Generator $low)
 
     function it_generates_a_random_string(Generator $medium)
     {
-        $medium->generateString(32, '')->shouldBeCalled();
+        $medium->generateString(32, '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')->shouldBeCalled();
         $this->generate();
     }
 

src/Vivait/StringGeneratorBundle/Generator/SecureStringGenerator.php

@@ -20,7 +20,7 @@ class SecureStringGenerator implements ConfigurableGeneratorInterface
      */
     private $generator;
 
-    private $chars = '';
+    private $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
     private $strength = 'medium';
 

src/Vivait/StringGeneratorBundle/Generator/StringGenerator.php

@@ -16,7 +16,7 @@ class StringGenerator implements ConfigurableGeneratorInterface
     /**
      * @var string
      */
-    private $chars = 'abcdefjhijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ12345567890';
+    private $chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
 
     /**
      * @var string