Backport all random improvements

Graham Campbell · Graham Campbell · commit d18f4331df13 · 2015-06-03T23:56:32.000+01:00
diff --git a/src/Illuminate/Support/Str.php b/src/Illuminate/Support/Str.php
@@ -213,26 +213,46 @@ public static function plural($value, $count = 2)
 	 */
 	public static function random($length = 16)
 	{
-		if ( ! function_exists('openssl_random_pseudo_bytes'))
+		$string = '';
+
+		while (($len = strlen($string)) < $length)
 		{
-			throw new RuntimeException('OpenSSL extension is required.');
+			$size = $length - $len;
+			$bytes = static::randomBytes($size * 2);
+			$string .= substr(str_replace(['/', '+', '='], '', base64_encode($bytes)), 0, $size);
 		}
 
-		$bytes = openssl_random_pseudo_bytes($length * 2, $strong);
+		return $string;
+	}
 
-		if ($bytes === false || $strong === false)
+	/**
+	 * Generate a more truly "random" bytes.
+	 *
+	 * @param  int  $length
+	 * @return string
+	 *
+	 * @throws \RuntimeException
+	 */
+	public static function randomBytes($length = 16)
+	{
+		if (function_exists('random_bytes'))
 		{
-			throw new RuntimeException('Unable to generate random string.');
+			$bytes = random_bytes($length);
 		}
-
-		$string = substr(str_replace(array('/', '+', '='), '', base64_encode($bytes)), 0, $length);
-
-		while (($len = strlen($string)) < $length)
+		elseif (function_exists('openssl_random_pseudo_bytes'))
+		{
+			$bytes = openssl_random_pseudo_bytes($length, $strong);
+			if ($bytes === false || $strong === false)
+			{
+				throw new RuntimeException('Unable to generate random string.');
+			}
+		}
+		else
 		{
-			$string .= static::random($length - $len);
+			throw new RuntimeException('OpenSSL extension is required for PHP 5 users.');
 		}
 
-		return $string;
+		return $bytes;
 	}
 
 	/**
