Completed
Pull Request — develop (#1726)
by
unknown
19:16
created
plugin-and-theme-hooks/class-gravityview-plugin-hooks-trustedlogin.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 		return array(
73 73
 			'auth' => array(
74 74
 				'api_key' => self::TRUSTEDLOGIN_API_KEY,
75
-				'license_key' => gravityview()->plugin->settings->get('license_key'),
75
+				'license_key' => gravityview()->plugin->settings->get( 'license_key' ),
76 76
 			),
77 77
 			'menu' => array(
78 78
 				'slug' => 'edit.php?post_type=gravityview',
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 	 */
154 154
 	public function log( $message, $method = '', $level = 'debug', $data = array() ) {
155 155
 
156
-		$data['method'] = $method;
156
+		$data[ 'method' ] = $method;
157 157
 
158 158
 		gravityview()->log->{$level}( $message, $data );
159 159
 	}
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 	public function filter_is_admin_page( $is_admin = false ) {
170 170
 		global $current_screen;
171 171
 
172
-		if( $current_screen && 'gravityview_page_grant-' . self::TRUSTEDLOGIN_NAMESPACE . '-access' === $current_screen->id ) {
172
+		if ( $current_screen && 'gravityview_page_grant-' . self::TRUSTEDLOGIN_NAMESPACE . '-access' === $current_screen->id ) {
173 173
 			return true;
174 174
 		}
175 175
 
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 			return $localization_data;
190 190
 		}
191 191
 
192
-		$localization_data['data']['tl_access_key'] = self::$TL_Client->get_access_key();
192
+		$localization_data[ 'data' ][ 'tl_access_key' ] = self::$TL_Client->get_access_key();
193 193
 
194 194
 		return $localization_data;
195 195
 	}
Please login to merge, or discard this patch.
vendor/paragonie/random_compat/lib/random_bytes_dev_urandom.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
                      */
Please login to merge, or discard this patch.
vendor/paragonie/random_compat/lib/random_int.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
vendor/paragonie/random_compat/lib/random_bytes_libsodium_legacy.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
vendor/paragonie/random_compat/lib/cast_to_int.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
             );
Please login to merge, or discard this patch.
vendor/paragonie/random_compat/lib/random_bytes_mcrypt.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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:
Please login to merge, or discard this patch.
vendor/paragonie/random_compat/lib/random_bytes_libsodium.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
vendor/paragonie/random_compat/lib/random.php 1 patch
Spacing   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -29,14 +29,14 @@  discard block
 block discarded – undo
29 29
  * SOFTWARE.
30 30
  */
31 31
 
32
-if (!defined('PHP_VERSION_ID')) {
32
+if ( ! defined( 'PHP_VERSION_ID' ) ) {
33 33
     // This constant was introduced in PHP 5.2.7
34
-    $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION));
34
+    $RandomCompatversion = array_map( 'intval', explode( '.', PHP_VERSION ) );
35 35
     define(
36 36
         'PHP_VERSION_ID',
37
-        $RandomCompatversion[0] * 10000
38
-        + $RandomCompatversion[1] * 100
39
-        + $RandomCompatversion[2]
37
+        $RandomCompatversion[ 0 ] * 10000
38
+        + $RandomCompatversion[ 1 ] * 100
39
+        + $RandomCompatversion[ 2 ]
40 40
     );
41 41
     $RandomCompatversion = null;
42 42
 }
@@ -44,21 +44,21 @@  discard block
 block discarded – undo
44 44
 /**
45 45
  * PHP 7.0.0 and newer have these functions natively.
46 46
  */
47
-if (PHP_VERSION_ID >= 70000) {
47
+if ( PHP_VERSION_ID >= 70000 ) {
48 48
     return;
49 49
 }
50 50
 
51
-if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
52
-    define('RANDOM_COMPAT_READ_BUFFER', 8);
51
+if ( ! defined( 'RANDOM_COMPAT_READ_BUFFER' ) ) {
52
+    define( 'RANDOM_COMPAT_READ_BUFFER', 8 );
53 53
 }
54 54
 
55
-$RandomCompatDIR = dirname(__FILE__);
55
+$RandomCompatDIR = dirname( __FILE__ );
56 56
 
57
-require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'byte_safe_strings.php';
58
-require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'cast_to_int.php';
59
-require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'error_polyfill.php';
57
+require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'byte_safe_strings.php';
58
+require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'cast_to_int.php';
59
+require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'error_polyfill.php';
60 60
 
61
-if (!is_callable('random_bytes')) {
61
+if ( ! is_callable( 'random_bytes' ) ) {
62 62
     /**
63 63
      * PHP 5.2.0 - 5.6.x way to implement random_bytes()
64 64
      *
@@ -73,42 +73,42 @@  discard block
 block discarded – undo
73 73
      *
74 74
      * See RATIONALE.md for our reasoning behind this particular order
75 75
      */
76
-    if (extension_loaded('libsodium')) {
76
+    if ( extension_loaded( 'libsodium' ) ) {
77 77
         // See random_bytes_libsodium.php
78
-        if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
79
-            require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_libsodium.php';
80
-        } elseif (method_exists('Sodium', 'randombytes_buf')) {
81
-            require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_libsodium_legacy.php';
78
+        if ( PHP_VERSION_ID >= 50300 && is_callable( '\\Sodium\\randombytes_buf' ) ) {
79
+            require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium.php';
80
+        } elseif ( method_exists( 'Sodium', 'randombytes_buf' ) ) {
81
+            require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium_legacy.php';
82 82
         }
83 83
     }
84 84
 
85 85
     /**
86 86
      * Reading directly from /dev/urandom:
87 87
      */
88
-    if (DIRECTORY_SEPARATOR === '/') {
88
+    if ( DIRECTORY_SEPARATOR === '/' ) {
89 89
         // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
90 90
         // way to exclude Windows.
91 91
         $RandomCompatUrandom = true;
92
-        $RandomCompat_basedir = ini_get('open_basedir');
92
+        $RandomCompat_basedir = ini_get( 'open_basedir' );
93 93
 
94
-        if (!empty($RandomCompat_basedir)) {
94
+        if ( ! empty( $RandomCompat_basedir ) ) {
95 95
             $RandomCompat_open_basedir = explode(
96 96
                 PATH_SEPARATOR,
97
-                strtolower($RandomCompat_basedir)
97
+                strtolower( $RandomCompat_basedir )
98 98
             );
99
-            $RandomCompatUrandom = (array() !== array_intersect(
100
-                array('/dev', '/dev/', '/dev/urandom'),
99
+            $RandomCompatUrandom = ( array() !== array_intersect(
100
+                array( '/dev', '/dev/', '/dev/urandom' ),
101 101
                 $RandomCompat_open_basedir
102
-            ));
102
+            ) );
103 103
             $RandomCompat_open_basedir = null;
104 104
         }
105 105
 
106 106
         if (
107
-            !is_callable('random_bytes')
107
+            ! is_callable( 'random_bytes' )
108 108
             &&
109 109
             $RandomCompatUrandom
110 110
             &&
111
-            @is_readable('/dev/urandom')
111
+            @is_readable( '/dev/urandom' )
112 112
         ) {
113 113
             // Error suppression on is_readable() in case of an open_basedir
114 114
             // or safe_mode failure. All we care about is whether or not we
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
             // place, that is not helpful to us here.
118 118
 
119 119
             // See random_bytes_dev_urandom.php
120
-            require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_dev_urandom.php';
120
+            require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_dev_urandom.php';
121 121
         }
122 122
         // Unset variables after use
123 123
         $RandomCompat_basedir = null;
@@ -144,22 +144,22 @@  discard block
 block discarded – undo
144 144
      *     we get insufficient entropy errors.
145 145
      */
146 146
     if (
147
-        !is_callable('random_bytes')
147
+        ! is_callable( 'random_bytes' )
148 148
         &&
149 149
         // Windows on PHP < 5.3.7 is broken, but non-Windows is not known to be.
150
-        (DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307)
150
+        ( DIRECTORY_SEPARATOR === '/' || PHP_VERSION_ID >= 50307 )
151 151
         &&
152 152
         // Prevent this code from hanging indefinitely on non-Windows;
153 153
         // see https://bugs.php.net/bug.php?id=69833
154 154
         (
155 155
             DIRECTORY_SEPARATOR !== '/' ||
156
-            (PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613)
156
+            ( PHP_VERSION_ID <= 50609 || PHP_VERSION_ID >= 50613 )
157 157
         )
158 158
         &&
159
-        extension_loaded('mcrypt')
159
+        extension_loaded( 'mcrypt' )
160 160
     ) {
161 161
         // See random_bytes_mcrypt.php
162
-        require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_mcrypt.php';
162
+        require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_mcrypt.php';
163 163
     }
164 164
     $RandomCompatUrandom = null;
165 165
 
@@ -168,26 +168,26 @@  discard block
 block discarded – undo
168 168
      * isn't loaded.
169 169
      */
170 170
     if (
171
-        !is_callable('random_bytes')
171
+        ! is_callable( 'random_bytes' )
172 172
         &&
173
-        extension_loaded('com_dotnet')
173
+        extension_loaded( 'com_dotnet' )
174 174
         &&
175
-        class_exists('COM')
175
+        class_exists( 'COM' )
176 176
     ) {
177 177
         $RandomCompat_disabled_classes = preg_split(
178 178
             '#\s*,\s*#',
179
-            strtolower(ini_get('disable_classes'))
179
+            strtolower( ini_get( 'disable_classes' ) )
180 180
         );
181 181
 
182
-        if (!in_array('com', $RandomCompat_disabled_classes)) {
182
+        if ( ! in_array( 'com', $RandomCompat_disabled_classes ) ) {
183 183
             try {
184
-                $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
184
+                $RandomCompatCOMtest = new COM( 'CAPICOM.Utilities.1' );
185 185
                 /** @psalm-suppress TypeDoesNotContainType */
186
-                if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
186
+                if ( method_exists( $RandomCompatCOMtest, 'GetRandom' ) ) {
187 187
                     // See random_bytes_com_dotnet.php
188
-                    require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_bytes_com_dotnet.php';
188
+                    require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_com_dotnet.php';
189 189
                 }
190
-            } catch (com_exception $e) {
190
+            } catch ( com_exception $e ) {
191 191
                 // Don't try to use it.
192 192
             }
193 193
         }
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
     /**
199 199
      * throw new Exception
200 200
      */
201
-    if (!is_callable('random_bytes')) {
201
+    if ( ! is_callable( 'random_bytes' ) ) {
202 202
         /**
203 203
          * We don't have any more options, so let's throw an exception right now
204 204
          * and hope the developer won't let it fail silently.
@@ -208,9 +208,9 @@  discard block
 block discarded – undo
208 208
          * @throws Exception
209 209
          * @return string
210 210
          */
211
-        function random_bytes($length)
211
+        function random_bytes( $length )
212 212
         {
213
-            unset($length); // Suppress "variable not used" warnings.
213
+            unset( $length ); // Suppress "variable not used" warnings.
214 214
             throw new Exception(
215 215
                 'There is no suitable CSPRNG installed on your system'
216 216
             );
@@ -219,8 +219,8 @@  discard block
 block discarded – undo
219 219
     }
220 220
 }
221 221
 
222
-if (!is_callable('random_int')) {
223
-    require_once $RandomCompatDIR.DIRECTORY_SEPARATOR.'random_int.php';
222
+if ( ! is_callable( 'random_int' ) ) {
223
+    require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_int.php';
224 224
 }
225 225
 
226 226
 $RandomCompatDIR = null;
Please login to merge, or discard this patch.
vendor/paragonie/random_compat/lib/error_polyfill.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.