@@ -61,8 +61,8 @@ discard block |
||
| 61 | 61 | $value = $this->get_value( $atts ); |
| 62 | 62 | |
| 63 | 63 | if ( false === $operator && is_null( $value ) ) { |
| 64 | - if ( false !== $atts['if'] ) { // Only-if test |
|
| 65 | - $match = $authed && ! in_array( strtolower( $atts['if'] ), array( '', '0', 'false', 'no' ) ); |
|
| 64 | + if ( false !== $atts[ 'if' ] ) { // Only-if test |
|
| 65 | + $match = $authed && ! in_array( strtolower( $atts[ 'if' ] ), array( '', '0', 'false', 'no' ) ); |
|
| 66 | 66 | } else { |
| 67 | 67 | $match = $authed; // Just login test |
| 68 | 68 | } |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | |
| 82 | 82 | // Need to match all AND |
| 83 | 83 | foreach ( $and_values as $and_value ) { |
| 84 | - $match = $authed && \GVCommon::matches_operation( $atts['if'], $and_value, $operator ); |
|
| 84 | + $match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $and_value, $operator ); |
|
| 85 | 85 | if ( ! $match ) { |
| 86 | 86 | break; |
| 87 | 87 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | // Only need to match a single OR |
| 93 | 93 | foreach ( $or_values as $or_value ) { |
| 94 | 94 | |
| 95 | - $match = \GVCommon::matches_operation( $atts['if'], $or_value, $operator ); |
|
| 95 | + $match = \GVCommon::matches_operation( $atts[ 'if' ], $or_value, $operator ); |
|
| 96 | 96 | |
| 97 | 97 | // Negate the negative operators |
| 98 | 98 | if ( ( $authed && $match ) || ( $authed && ( ! $match && in_array( $operator, array( 'isnot', 'not_contains', 'not_in' ) ) ) ) ) { |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | } else { |
| 104 | - $match = $authed && \GVCommon::matches_operation( $atts['if'], $value, $operator ); |
|
| 104 | + $match = $authed && \GVCommon::matches_operation( $atts[ 'if' ], $value, $operator ); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | $output = $this->get_output( $match, $atts, $output ); |
@@ -189,8 +189,8 @@ discard block |
||
| 189 | 189 | * @return string The output. |
| 190 | 190 | */ |
| 191 | 191 | private function get_output( $match, $atts, $content ) { |
| 192 | - if ( ! $match && ! empty( $atts['else'] ) ) { |
|
| 193 | - return $atts['else']; // Attributized else is easy :) |
|
| 192 | + if ( ! $match && ! empty( $atts[ 'else' ] ) ) { |
|
| 193 | + return $atts[ 'else' ]; // Attributized else is easy :) |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | $if = ''; |
@@ -317,18 +317,18 @@ discard block |
||
| 317 | 317 | $atts = array_intersect_key( $supplied_atts, $atts ); |
| 318 | 318 | |
| 319 | 319 | // Strip whitespace if it's not default false |
| 320 | - if ( isset( $atts['if'] ) && is_string( $atts['if'] ) ) { |
|
| 321 | - $atts['if'] = trim( $atts['if'] ); |
|
| 320 | + if ( isset( $atts[ 'if' ] ) && is_string( $atts[ 'if' ] ) ) { |
|
| 321 | + $atts[ 'if' ] = trim( $atts[ 'if' ] ); |
|
| 322 | 322 | } else { |
| 323 | - $atts['if'] = false; |
|
| 323 | + $atts[ 'if' ] = false; |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | - if ( isset( $atts['logged_in'] ) ) { |
|
| 326 | + if ( isset( $atts[ 'logged_in' ] ) ) { |
|
| 327 | 327 | // Truthy |
| 328 | - if ( in_array( strtolower( $atts['logged_in'] ), array( '0', 'false', 'no' ) ) ) { |
|
| 329 | - $atts['logged_in'] = false; |
|
| 328 | + if ( in_array( strtolower( $atts[ 'logged_in' ] ), array( '0', 'false', 'no' ) ) ) { |
|
| 329 | + $atts[ 'logged_in' ] = false; |
|
| 330 | 330 | } else { |
| 331 | - $atts['logged_in'] = true; |
|
| 331 | + $atts[ 'logged_in' ] = true; |
|
| 332 | 332 | } |
| 333 | 333 | } |
| 334 | 334 | |
@@ -23,8 +23,8 @@ discard block |
||
| 23 | 23 | add_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10, 4 ); |
| 24 | 24 | add_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) ); |
| 25 | 25 | |
| 26 | - add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') ); |
|
| 27 | - add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') ); |
|
| 26 | + add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 27 | + add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) ); |
|
| 28 | 28 | |
| 29 | 29 | add_action( 'gravityview/template/after', array( $this, 'print_scripts' ) ); |
| 30 | 30 | |
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | remove_filter( 'gravityview/fields/fileupload/link_atts', array( $this, 'fileupload_link_atts' ), 10 ); |
| 93 | 93 | remove_filter( 'gravityview/get_link/allowed_atts', array( $this, 'allowed_atts' ) ); |
| 94 | 94 | |
| 95 | - remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts') ); |
|
| 96 | - remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles') ); |
|
| 95 | + remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts' ) ); |
|
| 96 | + remove_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) ); |
|
| 97 | 97 | |
| 98 | 98 | remove_action( 'wp_footer', array( $this, 'output_footer' ) ); |
| 99 | 99 | } |
@@ -555,7 +555,7 @@ discard block |
||
| 555 | 555 | if ( ! $detailed ) { |
| 556 | 556 | $defaults = array(); |
| 557 | 557 | foreach ( $default_settings as $key => $value ) { |
| 558 | - $defaults[ $key ] = $value['value']; |
|
| 558 | + $defaults[ $key ] = $value[ 'value' ]; |
|
| 559 | 559 | } |
| 560 | 560 | return $defaults; |
| 561 | 561 | |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | // If the $group argument is set for the method, |
| 567 | 567 | // ignore any settings that aren't in that group. |
| 568 | 568 | if ( ! empty( $group ) && is_string( $group ) ) { |
| 569 | - if ( empty( $value['group'] ) || $value['group'] !== $group ) { |
|
| 569 | + if ( empty( $value[ 'group' ] ) || $value[ 'group' ] !== $group ) { |
|
| 570 | 570 | unset( $default_settings[ $key ] ); |
| 571 | 571 | } |
| 572 | 572 | } |
@@ -114,14 +114,14 @@ |
||
| 114 | 114 | /** Require critical legacy core files. @todo Deprecate */ |
| 115 | 115 | require_once $this->plugin->dir( 'includes/import-functions.php' ); |
| 116 | 116 | require_once $this->plugin->dir( 'includes/helper-functions.php' ); |
| 117 | - require_once $this->plugin->dir( 'includes/class-common.php'); |
|
| 118 | - require_once $this->plugin->dir( 'includes/connector-functions.php'); |
|
| 117 | + require_once $this->plugin->dir( 'includes/class-common.php' ); |
|
| 118 | + require_once $this->plugin->dir( 'includes/connector-functions.php' ); |
|
| 119 | 119 | require_once $this->plugin->dir( 'includes/class-gravityview-compatibility.php' ); |
| 120 | 120 | require_once $this->plugin->dir( 'includes/class-gravityview-roles-capabilities.php' ); |
| 121 | 121 | require_once $this->plugin->dir( 'includes/class-gravityview-admin-notices.php' ); |
| 122 | 122 | require_once $this->plugin->dir( 'includes/class-admin.php' ); |
| 123 | - require_once $this->plugin->dir( 'includes/class-post-types.php'); |
|
| 124 | - require_once $this->plugin->dir( 'includes/class-cache.php'); |
|
| 123 | + require_once $this->plugin->dir( 'includes/class-post-types.php' ); |
|
| 124 | + require_once $this->plugin->dir( 'includes/class-cache.php' ); |
|
| 125 | 125 | |
| 126 | 126 | /** |
| 127 | 127 | * GravityView extensions and widgets. |
@@ -46,11 +46,11 @@ discard block |
||
| 46 | 46 | */ |
| 47 | 47 | function gravityview_import_helper_fix_line_breaks( $postmeta = array(), $post_id = 0, $post = array() ) { |
| 48 | 48 | |
| 49 | - if ( empty( $post['postmeta'] ) ) { |
|
| 49 | + if ( empty( $post[ 'postmeta' ] ) ) { |
|
| 50 | 50 | return $postmeta; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - if ( 'gravityview' !== $post['post_type'] ) { |
|
| 53 | + if ( 'gravityview' !== $post[ 'post_type' ] ) { |
|
| 54 | 54 | return $postmeta; |
| 55 | 55 | } |
| 56 | 56 | |
@@ -62,27 +62,27 @@ discard block |
||
| 62 | 62 | $performed_fix = false; |
| 63 | 63 | |
| 64 | 64 | foreach ( $postmeta as &$meta ) { |
| 65 | - $key = $meta['key']; |
|
| 65 | + $key = $meta[ 'key' ]; |
|
| 66 | 66 | |
| 67 | 67 | if ( ! in_array( $key, $keys_to_fix, true ) ) { |
| 68 | 68 | continue; |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - $is_valid_serialized_data = maybe_unserialize( $meta['value'] ); |
|
| 71 | + $is_valid_serialized_data = maybe_unserialize( $meta[ 'value' ] ); |
|
| 72 | 72 | |
| 73 | 73 | // The values are not corrupted serialized data. No need to fix. |
| 74 | 74 | if ( false !== $is_valid_serialized_data ) { |
| 75 | 75 | continue; |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - $meta['value'] = str_replace( "\n", "\n\n", $meta['value'] ); |
|
| 78 | + $meta[ 'value' ] = str_replace( "\n", "\n\n", $meta[ 'value' ] ); |
|
| 79 | 79 | |
| 80 | 80 | $performed_fix = true; |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | // Leave a note that this modification has been done. We'll use it later. |
| 84 | 84 | if ( $performed_fix ) { |
| 85 | - $postmeta[] = array( |
|
| 85 | + $postmeta[ ] = array( |
|
| 86 | 86 | 'key' => '_gravityview_fixed_import_serialization', |
| 87 | 87 | 'value' => 1, |
| 88 | 88 | ); |
@@ -26,11 +26,11 @@ discard block |
||
| 26 | 26 | * SOFTWARE. |
| 27 | 27 | */ |
| 28 | 28 | |
| 29 | -if (!defined('RANDOM_COMPAT_READ_BUFFER')) { |
|
| 30 | - define('RANDOM_COMPAT_READ_BUFFER', 8); |
|
| 29 | +if ( ! defined( 'RANDOM_COMPAT_READ_BUFFER' ) ) { |
|
| 30 | + define( 'RANDOM_COMPAT_READ_BUFFER', 8 ); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | -if (!is_callable('random_bytes')) { |
|
| 33 | +if ( ! is_callable( 'random_bytes' ) ) { |
|
| 34 | 34 | /** |
| 35 | 35 | * Unless open_basedir is enabled, use /dev/urandom for |
| 36 | 36 | * random numbers in accordance with best practices |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | * |
| 46 | 46 | * @return string |
| 47 | 47 | */ |
| 48 | - function random_bytes($bytes) |
|
| 48 | + function random_bytes( $bytes ) |
|
| 49 | 49 | { |
| 50 | 50 | /** @var resource $fp */ |
| 51 | 51 | static $fp = null; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | /** |
| 54 | 54 | * This block should only be run once |
| 55 | 55 | */ |
| 56 | - if (empty($fp)) { |
|
| 56 | + if ( empty( $fp ) ) { |
|
| 57 | 57 | /** |
| 58 | 58 | * We don't want to ever read C:\dev\random, only /dev/urandom on |
| 59 | 59 | * Unix-like operating systems. While we guard against this |
@@ -64,8 +64,8 @@ discard block |
||
| 64 | 64 | * like operating system (which means the directory separator is set |
| 65 | 65 | * to "/" not "\". |
| 66 | 66 | */ |
| 67 | - if (DIRECTORY_SEPARATOR === '/') { |
|
| 68 | - if (!is_readable('/dev/urandom')) { |
|
| 67 | + if ( DIRECTORY_SEPARATOR === '/' ) { |
|
| 68 | + if ( ! is_readable( '/dev/urandom' ) ) { |
|
| 69 | 69 | throw new Exception( |
| 70 | 70 | 'Environment misconfiguration: ' . |
| 71 | 71 | '/dev/urandom cannot be read.' |
@@ -76,18 +76,18 @@ discard block |
||
| 76 | 76 | * We never fall back to /dev/random |
| 77 | 77 | */ |
| 78 | 78 | /** @var resource|bool $fp */ |
| 79 | - $fp = fopen('/dev/urandom', 'rb'); |
|
| 80 | - if (is_resource($fp)) { |
|
| 79 | + $fp = fopen( '/dev/urandom', 'rb' ); |
|
| 80 | + if ( is_resource( $fp ) ) { |
|
| 81 | 81 | /** @var array<string, int> $st */ |
| 82 | - $st = fstat($fp); |
|
| 83 | - if (($st['mode'] & 0170000) !== 020000) { |
|
| 84 | - fclose($fp); |
|
| 82 | + $st = fstat( $fp ); |
|
| 83 | + if ( ( $st[ 'mode' ] & 0170000 ) !== 020000 ) { |
|
| 84 | + fclose( $fp ); |
|
| 85 | 85 | $fp = false; |
| 86 | 86 | } |
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | |
| 90 | - if (is_resource($fp)) { |
|
| 90 | + if ( is_resource( $fp ) ) { |
|
| 91 | 91 | /** |
| 92 | 92 | * stream_set_read_buffer() does not exist in HHVM |
| 93 | 93 | * |
@@ -96,25 +96,25 @@ discard block |
||
| 96 | 96 | * |
| 97 | 97 | * stream_set_read_buffer returns 0 on success |
| 98 | 98 | */ |
| 99 | - if (is_callable('stream_set_read_buffer')) { |
|
| 100 | - stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER); |
|
| 99 | + if ( is_callable( 'stream_set_read_buffer' ) ) { |
|
| 100 | + stream_set_read_buffer( $fp, RANDOM_COMPAT_READ_BUFFER ); |
|
| 101 | 101 | } |
| 102 | - if (is_callable('stream_set_chunk_size')) { |
|
| 103 | - stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER); |
|
| 102 | + if ( is_callable( 'stream_set_chunk_size' ) ) { |
|
| 103 | + stream_set_chunk_size( $fp, RANDOM_COMPAT_READ_BUFFER ); |
|
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | 108 | try { |
| 109 | 109 | /** @var int $bytes */ |
| 110 | - $bytes = RandomCompat_intval($bytes); |
|
| 111 | - } catch (TypeError $ex) { |
|
| 110 | + $bytes = RandomCompat_intval( $bytes ); |
|
| 111 | + } catch ( TypeError $ex ) { |
|
| 112 | 112 | throw new TypeError( |
| 113 | 113 | 'random_bytes(): $bytes must be an integer' |
| 114 | 114 | ); |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - if ($bytes < 1) { |
|
| 117 | + if ( $bytes < 1 ) { |
|
| 118 | 118 | throw new Error( |
| 119 | 119 | 'Length must be greater than 0' |
| 120 | 120 | ); |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | * if (empty($fp)) line is logic that should only be run once per |
| 128 | 128 | * page load. |
| 129 | 129 | */ |
| 130 | - if (is_resource($fp)) { |
|
| 130 | + if ( is_resource( $fp ) ) { |
|
| 131 | 131 | /** |
| 132 | 132 | * @var int |
| 133 | 133 | */ |
@@ -145,8 +145,8 @@ discard block |
||
| 145 | 145 | /** |
| 146 | 146 | * @var string|bool |
| 147 | 147 | */ |
| 148 | - $read = fread($fp, $remaining); |
|
| 149 | - if (!is_string($read)) { |
|
| 148 | + $read = fread( $fp, $remaining ); |
|
| 149 | + if ( ! is_string( $read ) ) { |
|
| 150 | 150 | /** |
| 151 | 151 | * We cannot safely read from the file. Exit the |
| 152 | 152 | * do-while loop and trigger the exception condition |
@@ -159,19 +159,19 @@ discard block |
||
| 159 | 159 | /** |
| 160 | 160 | * Decrease the number of bytes returned from remaining |
| 161 | 161 | */ |
| 162 | - $remaining -= RandomCompat_strlen($read); |
|
| 162 | + $remaining -= RandomCompat_strlen( $read ); |
|
| 163 | 163 | /** |
| 164 | 164 | * @var string $buf |
| 165 | 165 | */ |
| 166 | 166 | $buf .= $read; |
| 167 | - } while ($remaining > 0); |
|
| 167 | + } while ( $remaining > 0 ); |
|
| 168 | 168 | |
| 169 | 169 | /** |
| 170 | 170 | * Is our result valid? |
| 171 | 171 | * @var string|bool $buf |
| 172 | 172 | */ |
| 173 | - if (is_string($buf)) { |
|
| 174 | - if (RandomCompat_strlen($buf) === $bytes) { |
|
| 173 | + if ( is_string( $buf ) ) { |
|
| 174 | + if ( RandomCompat_strlen( $buf ) === $bytes ) { |
|
| 175 | 175 | /** |
| 176 | 176 | * Return our random entropy buffer here: |
| 177 | 177 | */ |
@@ -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 | ); |