@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if (!is_callable('random_int')) { |
|
| 3 | +if ( ! is_callable( 'random_int' ) ) { |
|
| 4 | 4 | /** |
| 5 | 5 | * Random_* Compatibility Library |
| 6 | 6 | * for using the new PHP 7 random_* API in PHP 5 projects |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * |
| 39 | 39 | * @return int |
| 40 | 40 | */ |
| 41 | - function random_int($min, $max) |
|
| 41 | + function random_int( $min, $max ) |
|
| 42 | 42 | { |
| 43 | 43 | /** |
| 44 | 44 | * Type and input logic checks |
@@ -52,8 +52,8 @@ discard block |
||
| 52 | 52 | |
| 53 | 53 | try { |
| 54 | 54 | /** @var int $min */ |
| 55 | - $min = RandomCompat_intval($min); |
|
| 56 | - } catch (TypeError $ex) { |
|
| 55 | + $min = RandomCompat_intval( $min ); |
|
| 56 | + } catch ( TypeError $ex ) { |
|
| 57 | 57 | throw new TypeError( |
| 58 | 58 | 'random_int(): $min must be an integer' |
| 59 | 59 | ); |
@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | |
| 62 | 62 | try { |
| 63 | 63 | /** @var int $max */ |
| 64 | - $max = RandomCompat_intval($max); |
|
| 65 | - } catch (TypeError $ex) { |
|
| 64 | + $max = RandomCompat_intval( $max ); |
|
| 65 | + } catch ( TypeError $ex ) { |
|
| 66 | 66 | throw new TypeError( |
| 67 | 67 | 'random_int(): $max must be an integer' |
| 68 | 68 | ); |
@@ -73,14 +73,14 @@ discard block |
||
| 73 | 73 | * let's validate the logic then we can move forward with generating random |
| 74 | 74 | * integers along a given range. |
| 75 | 75 | */ |
| 76 | - if ($min > $max) { |
|
| 76 | + if ( $min > $max ) { |
|
| 77 | 77 | throw new Error( |
| 78 | 78 | 'Minimum value must be less than or equal to the maximum value' |
| 79 | 79 | ); |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - if ($max === $min) { |
|
| 83 | - return (int) $min; |
|
| 82 | + if ( $max === $min ) { |
|
| 83 | + return (int)$min; |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | /** |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | /** |
| 111 | 111 | * Test for integer overflow: |
| 112 | 112 | */ |
| 113 | - if (!is_int($range)) { |
|
| 113 | + if ( ! is_int( $range ) ) { |
|
| 114 | 114 | |
| 115 | 115 | /** |
| 116 | 116 | * Still safely calculate wider ranges. |
@@ -133,8 +133,8 @@ discard block |
||
| 133 | 133 | * $bits is effectively ceil(log($range, 2)) without dealing with |
| 134 | 134 | * type juggling |
| 135 | 135 | */ |
| 136 | - while ($range > 0) { |
|
| 137 | - if ($bits % 8 === 0) { |
|
| 136 | + while ( $range > 0 ) { |
|
| 137 | + if ( $bits % 8 === 0 ) { |
|
| 138 | 138 | ++$bytes; |
| 139 | 139 | } |
| 140 | 140 | ++$bits; |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * The rejection probability is at most 0.5, so this corresponds |
| 158 | 158 | * to a failure probability of 2^-128 for a working RNG |
| 159 | 159 | */ |
| 160 | - if ($attempts > 128) { |
|
| 160 | + if ( $attempts > 128 ) { |
|
| 161 | 161 | throw new Exception( |
| 162 | 162 | 'random_int: RNG is broken - too many rejections' |
| 163 | 163 | ); |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | /** |
| 167 | 167 | * Let's grab the necessary number of random bytes |
| 168 | 168 | */ |
| 169 | - $randomByteString = random_bytes($bytes); |
|
| 169 | + $randomByteString = random_bytes( $bytes ); |
|
| 170 | 170 | |
| 171 | 171 | /** |
| 172 | 172 | * Let's turn $randomByteString into an integer |
@@ -179,8 +179,8 @@ discard block |
||
| 179 | 179 | * 204631455 |
| 180 | 180 | */ |
| 181 | 181 | $val &= 0; |
| 182 | - for ($i = 0; $i < $bytes; ++$i) { |
|
| 183 | - $val |= ord($randomByteString[$i]) << ($i * 8); |
|
| 182 | + for ( $i = 0; $i < $bytes; ++$i ) { |
|
| 183 | + $val |= ord( $randomByteString[ $i ] ) << ( $i * 8 ); |
|
| 184 | 184 | } |
| 185 | 185 | /** @var int $val */ |
| 186 | 186 | |
@@ -197,8 +197,8 @@ discard block |
||
| 197 | 197 | * ... or smaller than $min, |
| 198 | 198 | * then try again. |
| 199 | 199 | */ |
| 200 | - } while (!is_int($val) || $val > $max || $val < $min); |
|
| 200 | + } while ( ! is_int( $val ) || $val > $max || $val < $min ); |
|
| 201 | 201 | |
| 202 | - return (int) $val; |
|
| 202 | + return (int)$val; |
|
| 203 | 203 | } |
| 204 | 204 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!is_callable('random_bytes')) { |
|
| 29 | +if ( ! is_callable( 'random_bytes' ) ) { |
|
| 30 | 30 | /** |
| 31 | 31 | * If the libsodium PHP extension is loaded, we'll use it above any other |
| 32 | 32 | * solution. |
@@ -40,18 +40,18 @@ discard block |
||
| 40 | 40 | * |
| 41 | 41 | * @return string |
| 42 | 42 | */ |
| 43 | - function random_bytes($bytes) |
|
| 43 | + function random_bytes( $bytes ) |
|
| 44 | 44 | { |
| 45 | 45 | try { |
| 46 | 46 | /** @var int $bytes */ |
| 47 | - $bytes = RandomCompat_intval($bytes); |
|
| 48 | - } catch (TypeError $ex) { |
|
| 47 | + $bytes = RandomCompat_intval( $bytes ); |
|
| 48 | + } catch ( TypeError $ex ) { |
|
| 49 | 49 | throw new TypeError( |
| 50 | 50 | 'random_bytes(): $bytes must be an integer' |
| 51 | 51 | ); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - if ($bytes < 1) { |
|
| 54 | + if ( $bytes < 1 ) { |
|
| 55 | 55 | throw new Error( |
| 56 | 56 | 'Length must be greater than 0' |
| 57 | 57 | ); |
@@ -66,19 +66,19 @@ discard block |
||
| 66 | 66 | * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be |
| 67 | 67 | * generated in one invocation. |
| 68 | 68 | */ |
| 69 | - if ($bytes > 2147483647) { |
|
| 70 | - for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
| 71 | - $n = ($bytes - $i) > 1073741824 |
|
| 69 | + if ( $bytes > 2147483647 ) { |
|
| 70 | + for ( $i = 0; $i < $bytes; $i += 1073741824 ) { |
|
| 71 | + $n = ( $bytes - $i ) > 1073741824 |
|
| 72 | 72 | ? 1073741824 |
| 73 | 73 | : $bytes - $i; |
| 74 | - $buf .= Sodium::randombytes_buf((int) $n); |
|
| 74 | + $buf .= Sodium::randombytes_buf( (int)$n ); |
|
| 75 | 75 | } |
| 76 | 76 | } else { |
| 77 | - $buf .= Sodium::randombytes_buf((int) $bytes); |
|
| 77 | + $buf .= Sodium::randombytes_buf( (int)$bytes ); |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | - if (is_string($buf)) { |
|
| 81 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
| 80 | + if ( is_string( $buf ) ) { |
|
| 81 | + if ( RandomCompat_strlen( $buf ) === $bytes ) { |
|
| 82 | 82 | return $buf; |
| 83 | 83 | } |
| 84 | 84 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!is_callable('RandomCompat_intval')) { |
|
| 29 | +if ( ! is_callable( 'RandomCompat_intval' ) ) { |
|
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | 32 | * Cast to an integer if we can, safely. |
@@ -45,29 +45,29 @@ discard block |
||
| 45 | 45 | * |
| 46 | 46 | * @throws TypeError |
| 47 | 47 | */ |
| 48 | - function RandomCompat_intval($number, $fail_open = false) |
|
| 48 | + function RandomCompat_intval( $number, $fail_open = false ) |
|
| 49 | 49 | { |
| 50 | - if (is_int($number) || is_float($number)) { |
|
| 50 | + if ( is_int( $number ) || is_float( $number ) ) { |
|
| 51 | 51 | $number += 0; |
| 52 | - } elseif (is_numeric($number)) { |
|
| 52 | + } elseif ( is_numeric( $number ) ) { |
|
| 53 | 53 | /** @psalm-suppress InvalidOperand */ |
| 54 | 54 | $number += 0; |
| 55 | 55 | } |
| 56 | 56 | /** @var int|float $number */ |
| 57 | 57 | |
| 58 | 58 | if ( |
| 59 | - is_float($number) |
|
| 59 | + is_float( $number ) |
|
| 60 | 60 | && |
| 61 | 61 | $number > ~PHP_INT_MAX |
| 62 | 62 | && |
| 63 | 63 | $number < PHP_INT_MAX |
| 64 | 64 | ) { |
| 65 | - $number = (int) $number; |
|
| 65 | + $number = (int)$number; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - if (is_int($number)) { |
|
| 69 | - return (int) $number; |
|
| 70 | - } elseif (!$fail_open) { |
|
| 68 | + if ( is_int( $number ) ) { |
|
| 69 | + return (int)$number; |
|
| 70 | + } elseif ( ! $fail_open ) { |
|
| 71 | 71 | throw new TypeError( |
| 72 | 72 | 'Expected an integer.' |
| 73 | 73 | ); |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!is_callable('random_bytes')) { |
|
| 29 | +if ( ! is_callable( 'random_bytes' ) ) { |
|
| 30 | 30 | /** |
| 31 | 31 | * Powered by ext/mcrypt (and thankfully NOT libmcrypt) |
| 32 | 32 | * |
@@ -39,29 +39,29 @@ discard block |
||
| 39 | 39 | * |
| 40 | 40 | * @return string |
| 41 | 41 | */ |
| 42 | - function random_bytes($bytes) |
|
| 42 | + function random_bytes( $bytes ) |
|
| 43 | 43 | { |
| 44 | 44 | try { |
| 45 | 45 | /** @var int $bytes */ |
| 46 | - $bytes = RandomCompat_intval($bytes); |
|
| 47 | - } catch (TypeError $ex) { |
|
| 46 | + $bytes = RandomCompat_intval( $bytes ); |
|
| 47 | + } catch ( TypeError $ex ) { |
|
| 48 | 48 | throw new TypeError( |
| 49 | 49 | 'random_bytes(): $bytes must be an integer' |
| 50 | 50 | ); |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - if ($bytes < 1) { |
|
| 53 | + if ( $bytes < 1 ) { |
|
| 54 | 54 | throw new Error( |
| 55 | 55 | 'Length must be greater than 0' |
| 56 | 56 | ); |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | /** @var string|bool $buf */ |
| 60 | - $buf = @mcrypt_create_iv((int) $bytes, (int) MCRYPT_DEV_URANDOM); |
|
| 60 | + $buf = @mcrypt_create_iv( (int)$bytes, (int)MCRYPT_DEV_URANDOM ); |
|
| 61 | 61 | if ( |
| 62 | - is_string($buf) |
|
| 62 | + is_string( $buf ) |
|
| 63 | 63 | && |
| 64 | - RandomCompat_strlen($buf) === $bytes |
|
| 64 | + RandomCompat_strlen( $buf ) === $bytes |
|
| 65 | 65 | ) { |
| 66 | 66 | /** |
| 67 | 67 | * Return our random entropy buffer here: |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!is_callable('random_bytes')) { |
|
| 29 | +if ( ! is_callable( 'random_bytes' ) ) { |
|
| 30 | 30 | /** |
| 31 | 31 | * If the libsodium PHP extension is loaded, we'll use it above any other |
| 32 | 32 | * solution. |
@@ -40,18 +40,18 @@ discard block |
||
| 40 | 40 | * |
| 41 | 41 | * @return string |
| 42 | 42 | */ |
| 43 | - function random_bytes($bytes) |
|
| 43 | + function random_bytes( $bytes ) |
|
| 44 | 44 | { |
| 45 | 45 | try { |
| 46 | 46 | /** @var int $bytes */ |
| 47 | - $bytes = RandomCompat_intval($bytes); |
|
| 48 | - } catch (TypeError $ex) { |
|
| 47 | + $bytes = RandomCompat_intval( $bytes ); |
|
| 48 | + } catch ( TypeError $ex ) { |
|
| 49 | 49 | throw new TypeError( |
| 50 | 50 | 'random_bytes(): $bytes must be an integer' |
| 51 | 51 | ); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | - if ($bytes < 1) { |
|
| 54 | + if ( $bytes < 1 ) { |
|
| 55 | 55 | throw new Error( |
| 56 | 56 | 'Length must be greater than 0' |
| 57 | 57 | ); |
@@ -62,21 +62,21 @@ discard block |
||
| 62 | 62 | * generated in one invocation. |
| 63 | 63 | */ |
| 64 | 64 | /** @var string|bool $buf */ |
| 65 | - if ($bytes > 2147483647) { |
|
| 65 | + if ( $bytes > 2147483647 ) { |
|
| 66 | 66 | $buf = ''; |
| 67 | - for ($i = 0; $i < $bytes; $i += 1073741824) { |
|
| 68 | - $n = ($bytes - $i) > 1073741824 |
|
| 67 | + for ( $i = 0; $i < $bytes; $i += 1073741824 ) { |
|
| 68 | + $n = ( $bytes - $i ) > 1073741824 |
|
| 69 | 69 | ? 1073741824 |
| 70 | 70 | : $bytes - $i; |
| 71 | - $buf .= \Sodium\randombytes_buf($n); |
|
| 71 | + $buf .= \Sodium\randombytes_buf( $n ); |
|
| 72 | 72 | } |
| 73 | 73 | } else { |
| 74 | 74 | /** @var string|bool $buf */ |
| 75 | - $buf = \Sodium\randombytes_buf($bytes); |
|
| 75 | + $buf = \Sodium\randombytes_buf( $bytes ); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - if (is_string($buf)) { |
|
| 79 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
| 78 | + if ( is_string( $buf ) ) { |
|
| 79 | + if ( RandomCompat_strlen( $buf ) === $bytes ) { |
|
| 80 | 80 | return $buf; |
| 81 | 81 | } |
| 82 | 82 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!class_exists('Error', false)) { |
|
| 29 | +if ( ! class_exists( 'Error', false ) ) { |
|
| 30 | 30 | // We can't really avoid making this extend Exception in PHP 5. |
| 31 | 31 | class Error extends Exception |
| 32 | 32 | { |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | -if (!class_exists('TypeError', false)) { |
|
| 38 | - if (is_subclass_of('Error', 'Exception')) { |
|
| 37 | +if ( ! class_exists( 'TypeError', false ) ) { |
|
| 38 | + if ( is_subclass_of( 'Error', 'Exception' ) ) { |
|
| 39 | 39 | class TypeError extends Error |
| 40 | 40 | { |
| 41 | 41 | |
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!is_callable('RandomCompat_strlen')) { |
|
| 29 | +if ( ! is_callable( 'RandomCompat_strlen' ) ) { |
|
| 30 | 30 | if ( |
| 31 | - defined('MB_OVERLOAD_STRING') |
|
| 31 | + defined( 'MB_OVERLOAD_STRING' ) |
|
| 32 | 32 | && |
| 33 | - ((int) ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING |
|
| 33 | + ( (int)ini_get( 'mbstring.func_overload' ) ) & MB_OVERLOAD_STRING |
|
| 34 | 34 | ) { |
| 35 | 35 | /** |
| 36 | 36 | * strlen() implementation that isn't brittle to mbstring.func_overload |
@@ -44,15 +44,15 @@ discard block |
||
| 44 | 44 | * |
| 45 | 45 | * @return int |
| 46 | 46 | */ |
| 47 | - function RandomCompat_strlen($binary_string) |
|
| 47 | + function RandomCompat_strlen( $binary_string ) |
|
| 48 | 48 | { |
| 49 | - if (!is_string($binary_string)) { |
|
| 49 | + if ( ! is_string( $binary_string ) ) { |
|
| 50 | 50 | throw new TypeError( |
| 51 | 51 | 'RandomCompat_strlen() expects a string' |
| 52 | 52 | ); |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - return (int) mb_strlen($binary_string, '8bit'); |
|
| 55 | + return (int)mb_strlen( $binary_string, '8bit' ); |
|
| 56 | 56 | } |
| 57 | 57 | |
| 58 | 58 | } else { |
@@ -67,24 +67,24 @@ discard block |
||
| 67 | 67 | * |
| 68 | 68 | * @return int |
| 69 | 69 | */ |
| 70 | - function RandomCompat_strlen($binary_string) |
|
| 70 | + function RandomCompat_strlen( $binary_string ) |
|
| 71 | 71 | { |
| 72 | - if (!is_string($binary_string)) { |
|
| 72 | + if ( ! is_string( $binary_string ) ) { |
|
| 73 | 73 | throw new TypeError( |
| 74 | 74 | 'RandomCompat_strlen() expects a string' |
| 75 | 75 | ); |
| 76 | 76 | } |
| 77 | - return (int) strlen($binary_string); |
|
| 77 | + return (int)strlen( $binary_string ); |
|
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | -if (!is_callable('RandomCompat_substr')) { |
|
| 82 | +if ( ! is_callable( 'RandomCompat_substr' ) ) { |
|
| 83 | 83 | |
| 84 | 84 | if ( |
| 85 | - defined('MB_OVERLOAD_STRING') |
|
| 85 | + defined( 'MB_OVERLOAD_STRING' ) |
|
| 86 | 86 | && |
| 87 | - ((int) ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING |
|
| 87 | + ( (int)ini_get( 'mbstring.func_overload' ) ) & MB_OVERLOAD_STRING |
|
| 88 | 88 | ) { |
| 89 | 89 | /** |
| 90 | 90 | * substr() implementation that isn't brittle to mbstring.func_overload |
@@ -100,45 +100,45 @@ discard block |
||
| 100 | 100 | * |
| 101 | 101 | * @return string |
| 102 | 102 | */ |
| 103 | - function RandomCompat_substr($binary_string, $start, $length = null) |
|
| 103 | + function RandomCompat_substr( $binary_string, $start, $length = null ) |
|
| 104 | 104 | { |
| 105 | - if (!is_string($binary_string)) { |
|
| 105 | + if ( ! is_string( $binary_string ) ) { |
|
| 106 | 106 | throw new TypeError( |
| 107 | 107 | 'RandomCompat_substr(): First argument should be a string' |
| 108 | 108 | ); |
| 109 | 109 | } |
| 110 | 110 | |
| 111 | - if (!is_int($start)) { |
|
| 111 | + if ( ! is_int( $start ) ) { |
|
| 112 | 112 | throw new TypeError( |
| 113 | 113 | 'RandomCompat_substr(): Second argument should be an integer' |
| 114 | 114 | ); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - if ($length === null) { |
|
| 117 | + if ( $length === null ) { |
|
| 118 | 118 | /** |
| 119 | 119 | * mb_substr($str, 0, NULL, '8bit') returns an empty string on |
| 120 | 120 | * PHP 5.3, so we have to find the length ourselves. |
| 121 | 121 | */ |
| 122 | 122 | /** @var int $length */ |
| 123 | - $length = RandomCompat_strlen($binary_string) - $start; |
|
| 124 | - } elseif (!is_int($length)) { |
|
| 123 | + $length = RandomCompat_strlen( $binary_string ) - $start; |
|
| 124 | + } elseif ( ! is_int( $length ) ) { |
|
| 125 | 125 | throw new TypeError( |
| 126 | 126 | 'RandomCompat_substr(): Third argument should be an integer, or omitted' |
| 127 | 127 | ); |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | // Consistency with PHP's behavior |
| 131 | - if ($start === RandomCompat_strlen($binary_string) && $length === 0) { |
|
| 131 | + if ( $start === RandomCompat_strlen( $binary_string ) && $length === 0 ) { |
|
| 132 | 132 | return ''; |
| 133 | 133 | } |
| 134 | - if ($start > RandomCompat_strlen($binary_string)) { |
|
| 134 | + if ( $start > RandomCompat_strlen( $binary_string ) ) { |
|
| 135 | 135 | return ''; |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - return (string) mb_substr( |
|
| 139 | - (string) $binary_string, |
|
| 140 | - (int) $start, |
|
| 141 | - (int) $length, |
|
| 138 | + return (string)mb_substr( |
|
| 139 | + (string)$binary_string, |
|
| 140 | + (int)$start, |
|
| 141 | + (int)$length, |
|
| 142 | 142 | '8bit' |
| 143 | 143 | ); |
| 144 | 144 | } |
@@ -158,37 +158,37 @@ discard block |
||
| 158 | 158 | * |
| 159 | 159 | * @return string |
| 160 | 160 | */ |
| 161 | - function RandomCompat_substr($binary_string, $start, $length = null) |
|
| 161 | + function RandomCompat_substr( $binary_string, $start, $length = null ) |
|
| 162 | 162 | { |
| 163 | - if (!is_string($binary_string)) { |
|
| 163 | + if ( ! is_string( $binary_string ) ) { |
|
| 164 | 164 | throw new TypeError( |
| 165 | 165 | 'RandomCompat_substr(): First argument should be a string' |
| 166 | 166 | ); |
| 167 | 167 | } |
| 168 | 168 | |
| 169 | - if (!is_int($start)) { |
|
| 169 | + if ( ! is_int( $start ) ) { |
|
| 170 | 170 | throw new TypeError( |
| 171 | 171 | 'RandomCompat_substr(): Second argument should be an integer' |
| 172 | 172 | ); |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - if ($length !== null) { |
|
| 176 | - if (!is_int($length)) { |
|
| 175 | + if ( $length !== null ) { |
|
| 176 | + if ( ! is_int( $length ) ) { |
|
| 177 | 177 | throw new TypeError( |
| 178 | 178 | 'RandomCompat_substr(): Third argument should be an integer, or omitted' |
| 179 | 179 | ); |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - return (string) substr( |
|
| 183 | - (string )$binary_string, |
|
| 184 | - (int) $start, |
|
| 185 | - (int) $length |
|
| 182 | + return (string)substr( |
|
| 183 | + (string)$binary_string, |
|
| 184 | + (int)$start, |
|
| 185 | + (int)$length |
|
| 186 | 186 | ); |
| 187 | 187 | } |
| 188 | 188 | |
| 189 | - return (string) substr( |
|
| 190 | - (string) $binary_string, |
|
| 191 | - (int) $start |
|
| 189 | + return (string)substr( |
|
| 190 | + (string)$binary_string, |
|
| 191 | + (int)$start |
|
| 192 | 192 | ); |
| 193 | 193 | } |
| 194 | 194 | } |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!is_callable('random_bytes')) { |
|
| 29 | +if ( ! is_callable( 'random_bytes' ) ) { |
|
| 30 | 30 | /** |
| 31 | 31 | * Windows with PHP < 5.3.0 will not have the function |
| 32 | 32 | * openssl_random_pseudo_bytes() available, so let's use |
@@ -38,18 +38,18 @@ discard block |
||
| 38 | 38 | * |
| 39 | 39 | * @return string |
| 40 | 40 | */ |
| 41 | - function random_bytes($bytes) |
|
| 41 | + function random_bytes( $bytes ) |
|
| 42 | 42 | { |
| 43 | 43 | try { |
| 44 | 44 | /** @var int $bytes */ |
| 45 | - $bytes = RandomCompat_intval($bytes); |
|
| 46 | - } catch (TypeError $ex) { |
|
| 45 | + $bytes = RandomCompat_intval( $bytes ); |
|
| 46 | + } catch ( TypeError $ex ) { |
|
| 47 | 47 | throw new TypeError( |
| 48 | 48 | 'random_bytes(): $bytes must be an integer' |
| 49 | 49 | ); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - if ($bytes < 1) { |
|
| 52 | + if ( $bytes < 1 ) { |
|
| 53 | 53 | throw new Error( |
| 54 | 54 | 'Length must be greater than 0' |
| 55 | 55 | ); |
@@ -57,13 +57,13 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | /** @var string $buf */ |
| 59 | 59 | $buf = ''; |
| 60 | - if (!class_exists('COM')) { |
|
| 60 | + if ( ! class_exists( 'COM' ) ) { |
|
| 61 | 61 | throw new Error( |
| 62 | 62 | 'COM does not exist' |
| 63 | 63 | ); |
| 64 | 64 | } |
| 65 | 65 | /** @var COM $util */ |
| 66 | - $util = new COM('CAPICOM.Utilities.1'); |
|
| 66 | + $util = new COM( 'CAPICOM.Utilities.1' ); |
|
| 67 | 67 | $execCount = 0; |
| 68 | 68 | |
| 69 | 69 | /** |
@@ -71,15 +71,15 @@ discard block |
||
| 71 | 71 | * get N bytes of random data, then CAPICOM has failed us. |
| 72 | 72 | */ |
| 73 | 73 | do { |
| 74 | - $buf .= base64_decode((string) $util->GetRandom($bytes, 0)); |
|
| 75 | - if (RandomCompat_strlen($buf) >= $bytes) { |
|
| 74 | + $buf .= base64_decode( (string)$util->GetRandom( $bytes, 0 ) ); |
|
| 75 | + if ( RandomCompat_strlen( $buf ) >= $bytes ) { |
|
| 76 | 76 | /** |
| 77 | 77 | * Return our random entropy buffer here: |
| 78 | 78 | */ |
| 79 | - return (string) RandomCompat_substr($buf, 0, $bytes); |
|
| 79 | + return (string)RandomCompat_substr( $buf, 0, $bytes ); |
|
| 80 | 80 | } |
| 81 | 81 | ++$execCount; |
| 82 | - } while ($execCount < $bytes); |
|
| 82 | + } while ( $execCount < $bytes ); |
|
| 83 | 83 | |
| 84 | 84 | /** |
| 85 | 85 | * If we reach here, PHP has failed us. |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | namespace Sodium; |
| 3 | 3 | |
| 4 | -require_once dirname(dirname(__FILE__)) . '/autoload.php'; |
|
| 4 | +require_once dirname( dirname( __FILE__ ) ) . '/autoload.php'; |
|
| 5 | 5 | |
| 6 | 6 | use ParagonIE_Sodium_Compat; |
| 7 | 7 | |