Changeset 42344

Timestamp:

12/01/2017 03:06:13 AM (2 years ago)

Author:

dd32

Message:

Avoid PHP Linting errors in the Random_Compat library under PHP7.
The latest updates to the library are larger than preferred, so instead this modifies the library to lint properly.

Fixes #42439 for 4.9

Location:

branches/4.9/src/wp-includes/random_compat

Files:

• random_bytes_com_dotnet.php (modified) (2 diffs)
• random_bytes_dev_urandom.php (modified) (2 diffs)
• random_bytes_libsodium.php (modified) (2 diffs)
• random_bytes_libsodium_legacy.php (modified) (2 diffs)
• random_bytes_mcrypt.php (modified) (2 diffs)
• random_bytes_openssl.php (modified) (2 diffs)
• random_int.php (modified) (2 diffs)

branches/4.9/src/wp-includes/random_compat/random_bytes_com_dotnet.php

@@ -27 +27 @@
  */
 
+if ( ! is_callable( 'random_bytes' ) ):
 /**
  * Windows with PHP < 5.3.0 will not have the function
@@ -80 +81 @@
     );
 }
+endif;

branches/4.9/src/wp-includes/random_compat/random_bytes_dev_urandom.php

@@ -31 +31 @@
 }
 
+if ( ! is_callable( 'random_bytes' ) ):
 /**
  * Unless open_basedir is enabled, use /dev/urandom for
@@ -147 +148 @@
     );
 }
+endif;

branches/4.9/src/wp-includes/random_compat/random_bytes_libsodium.php

@@ -27 +27 @@
  */
 
+if ( ! is_callable( 'random_bytes' ) ):
 /**
  * If the libsodium PHP extension is loaded, we'll use it above any other
@@ -85 +86 @@
     );
 }
+endif;

branches/4.9/src/wp-includes/random_compat/random_bytes_libsodium_legacy.php

@@ -27 +27 @@
  */
 
+if ( ! is_callable( 'random_bytes' ) ):
 /**
  * If the libsodium PHP extension is loaded, we'll use it above any other
@@ -85 +86 @@
     );
 }
+endif;

branches/4.9/src/wp-includes/random_compat/random_bytes_mcrypt.php

@@ -28 +28 @@
 
 
+if ( ! is_callable( 'random_bytes' ) ):
 /**
  * Powered by ext/mcrypt (and thankfully NOT libmcrypt)
@@ -75 +76 @@
     );
 }
+endif;

branches/4.9/src/wp-includes/random_compat/random_bytes_openssl.php

@@ -27 +27 @@
  */
 
+if ( ! is_callable( 'random_bytes' ) ):
 /**
  * Since openssl_random_pseudo_bytes() uses openssl's 
@@ -82 +83 @@
     );
 }
+endif;

branches/4.9/src/wp-includes/random_compat/random_int.php

@@ -27 +27 @@
  */
 
+if ( ! is_callable( 'random_int' ) ):
 /**
  * Fetch a random integer between $min and $max inclusive
@@ -190 +191 @@
     return (int) $val;
 }
+endif;