Merge b4fc17e into 75b7fc3

Rebilly · Apr 1, 2020 · 2f98764 · 2f98764
2 parents 75b7fc3 + b4fc17e
commit 2f98764
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,8 +12,8 @@ matrix:
     - php: "7.2"
     - php: "7.3"
     - php: "7.4"
-  allow_failures:
-    - php: "7.4"
+#  allow_failures:
+#    - php: "7.4"
 
 notifications:
   email: false

diff --git a/composer.json b/composer.json
@@ -32,8 +32,8 @@
     "phpunit/phpunit": "^7.3",
     "php-coveralls/php-coveralls": "^2.1",
     "friendsofphp/php-cs-fixer": "^2.13",
-    "fzaninotto/faker": "~1.5",
-    "guzzlehttp/guzzle": "~6.0"
+    "guzzlehttp/guzzle": "~6.0",
+    "fzaninotto/faker": "^1.9.1"
   },
   "autoload-dev": {
     "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Util/RebillySignature.php b/src/Util/RebillySignature.php
@@ -67,9 +67,13 @@ public static function generateSignature($apiUser, $apiKey)
      */
     public static function generateNonce($length, $strong = true)
     {
+        if ($length <= 0 || !$strong) {
+            throw new RuntimeException('Failed to generate random string');
+        }
+
         $bytes = openssl_random_pseudo_bytes($length, $strong);
 
-        if ($bytes === false || !$strong) {
+        if ($bytes === false) {
             throw new RuntimeException('Failed to generate random string');
         }