Make sure our random strings are the correct length

Graham Campbell · Graham Campbell · commit 078f74923983 · 2015-06-03T17:25:32.000+01:00
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
@@ -225,7 +225,14 @@ public static function random($length = 16)
 			throw new RuntimeException('Unable to generate random string.');
 		}
 
-		return substr(str_replace(array('/', '+', '='), '', base64_encode($bytes)), 0, $length);
+		$string = substr(str_replace(array('/', '+', '='), '', base64_encode($bytes)), 0, $length);
+
+		while (($len = strlen($string)) < $length)
+		{
+			$string .= static::random($length - $len);
+		}
+
+		return $string;
 	}
 
 	/**

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,14 @@ public static function random($length = 16)`
`225`	`225`	`throw new RuntimeException('Unable to generate random string.');`
`226`	`226`	`}`
`227`	`227`
`228`		`- return substr(str_replace(array('/', '+', '='), '', base64_encode($bytes)), 0, $length);`
	`228`	`+ $string = substr(str_replace(array('/', '+', '='), '', base64_encode($bytes)), 0, $length);`
	`229`	`+`
	`230`	`+ while (($len = strlen($string)) < $length)`
	`231`	`+ {`
	`232`	`+ $string .= static::random($length - $len);`
	`233`	`+ }`
	`234`	`+`
	`235`	`+ return $string;`
`229`	`236`	`}`
`230`	`237`
`231`	`238`	`/**`