From ab8c4fe44577bf2ed9da78f31c67789b6b345088 Mon Sep 17 00:00:00 2001
From: Alireza Josheghani <a.josheghani@anetwork.ir>
Date: Sat, 4 Feb 2017 14:39:11 +0330
Subject: [PATCH] Update helper functions Update faker function to return
 Generator object fixed randomNumber if statement bug Update randomString
 helper function

---
 src/helpers.php | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/helpers.php b/src/helpers.php
index 0b0e9cd..95fd87a 100644
--- a/src/helpers.php
+++ b/src/helpers.php
@@ -23,11 +23,11 @@ function string($value)
      *
      * @author Alireza Josheghani <josheghani.dev@gmail.com>
      * @since 3 Feb 2016
-     * @return Faker
+     * @return Generator
      */
     function faker()
     {
-        return new Faker();
+        return new Generator();
     }
 }
 
@@ -49,7 +49,7 @@ function randomNumber($length = 20, $int = false)
 
         for($i = 1;$i <= $length;$i++){
             $num = $numbers[rand(0,strlen($numbers) - 1)];
-            if($num === 0 && $i === 1){
+            if($num == 0 && $i == 1){
                 continue;
             }
 
@@ -77,20 +77,19 @@ function randomNumber($length = 20, $int = false)
      */
     function randomString($length = 20, $type = null){
 
-        $uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+        $characters = [
+            'uppercase' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+            'lowercase' => 'abcdefghijklmnopqrstuvwxyz'
+        ];
 
-        $lowercase = 'abcdefghijklmnopqrstuvwxyz';
-
-        if(is_null($type)){
-
-            $characters = $uppercase . $lowercase;
-
-        } elseif ($type = 'lowercase'){
+        if(($type !== 'uppercase' && $type !== 'lowercase') && ! is_null($type)){
+            throw new \Exception("The type of $type does not exists!");
+        }
 
-            $characters = $lowercase;
+        $characters = array_merge($characters);
 
-        } else {
-            $characters = $uppercase;
+        if(! is_null($type)){
+            $characters = $characters[$type];
         }
 
         $string  = '';