Merge pull request #28 from terox/master

Ready to use in Symfony3

Author: kieljohn

.travis.yml

@@ -2,7 +2,6 @@ language: php
 sudo: false
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0
@@ -16,7 +15,6 @@ matrix:
   fast_finish: true
   allow_failures:
     - php: hhvm
-    - php: 7.0
 
 before_install:
   - composer selfupdate

composer.json

@@ -1,4 +1,4 @@
-{  
+{
     "name":"vivait/string-generator-bundle",
     "license": "MIT",
     "description":"Generate random strings for IDs or keys using property annotations",
@@ -11,11 +11,12 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.5.3",
         "doctrine/common": "~2.2",
         "doctrine/orm": "~2.2",
-        "symfony/security": "~2.1",
-        "symfony/options-resolver": "~2.1",
+        "symfony/polyfill-php70": "^1.3",
+        "symfony/security": "^2.8|^3.0",
+        "symfony/options-resolver": "^2.8|^3.0",
         "ircmaxell/random-lib": "~1.0"
     },
     "require-dev": {

spec/Vivait/StringGeneratorBundle/Generator/SecureBytesGeneratorSpec.php

@@ -4,7 +4,6 @@
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Symfony\Component\Security\Core\Util\SecureRandom;
 
 class SecureBytesGeneratorSpec extends ObjectBehavior
 {
@@ -13,12 +12,6 @@ function it_is_initializable()
         $this->shouldHaveType('Vivait\StringGeneratorBundle\Generator\SecureBytesGenerator');
     }
 
-    function let()
-    {
-        $secureRandom = new SecureRandom();
-        $this->beConstructedWith($secureRandom);
-    }
-
     function it_generates_random_string()
     {
         $this->setLength(10);

src/Vivait/StringGeneratorBundle/Generator/SecureBytesGenerator.php

@@ -3,7 +3,6 @@
 namespace Vivait\StringGeneratorBundle\Generator;
 
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Util\SecureRandom;
 use Vivait\StringGeneratorBundle\Model\ConfigurableGeneratorInterface;
 
 class SecureBytesGenerator implements ConfigurableGeneratorInterface
@@ -14,14 +13,6 @@ class SecureBytesGenerator implements ConfigurableGeneratorInterface
     private $secureRandom;
     private $length = 8;
 
-    /**
-     * @param SecureRandom $secureRandom
-     */
-    public function __construct(SecureRandom $secureRandom)
-    {
-        $this->secureRandom = $secureRandom;
-    }
-
     /**
      * @param integer $length
      * @return ConfigurableGeneratorInterface
@@ -37,7 +28,7 @@ public function setLength($length)
      */
     public function generate()
     {
-        return $this->secureRandom->nextBytes($this->length);
+        return random_bytes($this->length);
     }
 
     /**

src/Vivait/StringGeneratorBundle/Resources/config/services.yml

@@ -17,7 +17,6 @@ services:
 
     vivait_generator.generator.secure_bytes:
         class: Vivait\StringGeneratorBundle\Generator\SecureBytesGenerator
-        arguments: ["@security.secure_random"]
 
     vivait_generator.generator.secure_string:
         class: Vivait\StringGeneratorBundle\Generator\SecureStringGenerator