diff --git a/wp-admin/includes/class-ftp.php b/wp-admin/includes/class-ftp.php index 8e2624cedc..cb8a033631 100644 --- a/wp-admin/includes/class-ftp.php +++ b/wp-admin/includes/class-ftp.php @@ -899,7 +899,7 @@ class ftp_base { $mod_sockets = extension_loaded( 'sockets' ); if ( ! $mod_sockets && function_exists( 'dl' ) && is_callable( 'dl' ) ) { $prefix = ( PHP_SHLIB_SUFFIX == 'dll' ) ? 'php_' : ''; - @dl( $prefix . 'sockets.' . PHP_SHLIB_SUFFIX ); + @dl( $prefix . 'sockets.' . PHP_SHLIB_SUFFIX ); // phpcs:ignore PHPCompatibility.FunctionUse.RemovedFunctions.dlDeprecated $mod_sockets = extension_loaded( 'sockets' ); } diff --git a/wp-includes/ID3/module.audio-video.quicktime.php b/wp-includes/ID3/module.audio-video.quicktime.php index cfe8ff5a8c..3c66199b1b 100644 --- a/wp-includes/ID3/module.audio-video.quicktime.php +++ b/wp-includes/ID3/module.audio-video.quicktime.php @@ -114,7 +114,7 @@ class getid3_quicktime extends getid3_handler foreach ($info['quicktime']['comments']['location.ISO6709'] as $ISO6709string) { $ISO6709parsed = array('latitude'=>false, 'longitude'=>false, 'altitude'=>false); if (preg_match('#^([\\+\\-])([0-9]{2}|[0-9]{4}|[0-9]{6})(\\.[0-9]+)?([\\+\\-])([0-9]{3}|[0-9]{5}|[0-9]{7})(\\.[0-9]+)?(([\\+\\-])([0-9]{3}|[0-9]{5}|[0-9]{7})(\\.[0-9]+)?)?/$#', $ISO6709string, $matches)) { - @list($dummy, $lat_sign, $lat_deg, $lat_deg_dec, $lon_sign, $lon_deg, $lon_deg_dec, $dummy, $alt_sign, $alt_deg, $alt_deg_dec) = $matches; + @list($dummy, $lat_sign, $lat_deg, $lat_deg_dec, $lon_sign, $lon_deg, $lon_deg_dec, $dummy, $alt_sign, $alt_deg, $alt_deg_dec) = $matches; // phpcs:ignore PHPCompatibility.Lists.AssignmentOrder.Affected if (strlen($lat_deg) == 2) { // [+-]DD.D $ISO6709parsed['latitude'] = (($lat_sign == '-') ? -1 : 1) * floatval(ltrim($lat_deg, '0').$lat_deg_dec); diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index 24b0aa9e0a..e3c28a1cf1 100644 --- a/wp-includes/capabilities.php +++ b/wp-includes/capabilities.php @@ -290,8 +290,8 @@ function map_meta_cap( $cap, $user_id, ...$args ) { case 'edit_user_meta': case 'delete_user_meta': case 'add_user_meta': - list( $_, $object_type, $_ ) = explode( '_', $cap ); - $object_id = (int) $args[0]; + $object_type = explode( '_', $cap )[1]; + $object_id = (int) $args[0]; $object_subtype = get_object_subtype( $object_type, $object_id ); diff --git a/wp-includes/class-requests.php b/wp-includes/class-requests.php index e9773800cb..34f7b6121b 100644 --- a/wp-includes/class-requests.php +++ b/wp-includes/class-requests.php @@ -187,7 +187,8 @@ class Requests { // Don't search for a transport if it's already been done for these $capabilities if (isset(self::$transport[$cap_string]) && self::$transport[$cap_string] !== null) { - return new self::$transport[$cap_string](); + $class = self::$transport[$cap_string]; + return new $class(); } // @codeCoverageIgnoreEnd @@ -214,7 +215,8 @@ class Requests { throw new Requests_Exception('No working transports found', 'notransport', self::$transports); } - return new self::$transport[$cap_string](); + $class = self::$transport[$cap_string]; + return new $class(); } /**#@+ diff --git a/wp-includes/class-simplepie.php b/wp-includes/class-simplepie.php index 651bf60e3c..6bb5bf75fc 100644 --- a/wp-includes/class-simplepie.php +++ b/wp-includes/class-simplepie.php @@ -3165,7 +3165,7 @@ class SimplePie } $class = get_class($this); - $trace = debug_backtrace(); + $trace = debug_backtrace(); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection $file = $trace[0]['file']; $line = $trace[0]['line']; trigger_error("Call to undefined method $class::$method() in $file on line $line", E_USER_ERROR); diff --git a/wp-includes/cron.php b/wp-includes/cron.php index 7337ba307e..6f50cc7f95 100644 --- a/wp-includes/cron.php +++ b/wp-includes/cron.php @@ -402,7 +402,7 @@ function wp_clear_scheduled_hook( $hook, $args = array() ) { // Previously, this function took the arguments as discrete vars rather than an array like the rest of the API. if ( ! is_array( $args ) ) { _deprecated_argument( __FUNCTION__, '3.0.0', __( 'This argument has changed to an array to match the behavior of the other cron functions.' ) ); - $args = array_slice( func_get_args(), 1 ); + $args = array_slice( func_get_args(), 1 ); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection } /** diff --git a/wp-includes/functions.php b/wp-includes/functions.php index c319965fb9..35c1e2e2f3 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -6627,7 +6627,7 @@ function mbstring_binary_safe_encoding( $reset = false ) { static $overloaded = null; if ( is_null( $overloaded ) ) { - $overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 ); + $overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 ); // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated } if ( false === $overloaded ) { diff --git a/wp-includes/plugin.php b/wp-includes/plugin.php index dc4ec0deb1..2a97c9eba5 100644 --- a/wp-includes/plugin.php +++ b/wp-includes/plugin.php @@ -231,7 +231,7 @@ function apply_filters_ref_array( $tag, $args ) { // Do 'all' actions first. if ( isset( $wp_filter['all'] ) ) { $wp_current_filter[] = $tag; - $all_args = func_get_args(); + $all_args = func_get_args(); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection _wp_call_all_hook( $all_args ); } @@ -453,7 +453,7 @@ function do_action( $tag, ...$arg ) { // Do 'all' actions first. if ( isset( $wp_filter['all'] ) ) { $wp_current_filter[] = $tag; - $all_args = func_get_args(); + $all_args = func_get_args(); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection _wp_call_all_hook( $all_args ); } @@ -526,7 +526,7 @@ function do_action_ref_array( $tag, $args ) { // Do 'all' actions first. if ( isset( $wp_filter['all'] ) ) { $wp_current_filter[] = $tag; - $all_args = func_get_args(); + $all_args = func_get_args(); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection _wp_call_all_hook( $all_args ); } diff --git a/wp-includes/pomo/streams.php b/wp-includes/pomo/streams.php index 8d8a2edcc7..52228d9120 100644 --- a/wp-includes/pomo/streams.php +++ b/wp-includes/pomo/streams.php @@ -18,7 +18,7 @@ if ( ! class_exists( 'POMO_Reader', false ) ) : * PHP5 constructor. */ function __construct() { - $this->is_overloaded = ( ( ini_get( 'mbstring.func_overload' ) & 2 ) != 0 ) && function_exists( 'mb_substr' ); + $this->is_overloaded = ( ( ini_get( 'mbstring.func_overload' ) & 2 ) != 0 ) && function_exists( 'mb_substr' ); // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated $this->_pos = 0; } diff --git a/wp-includes/rss.php b/wp-includes/rss.php index 208ca72004..ffc2494789 100644 --- a/wp-includes/rss.php +++ b/wp-includes/rss.php @@ -385,10 +385,6 @@ class MagpieRSS { } function error( $errormsg, $lvl = E_USER_WARNING ) { - // append PHP's error message if track_errors enabled - if ( isset($php_errormsg) ) { - $errormsg .= " ($php_errormsg)"; - } if ( MAGPIE_DEBUG ) { trigger_error( $errormsg, $lvl); } else { @@ -821,10 +817,6 @@ class RSSCache { Purpose: register error \*=======================================================================*/ function error ($errormsg, $lvl=E_USER_WARNING) { - // append PHP's error message if track_errors enabled - if ( isset($php_errormsg) ) { - $errormsg .= " ($php_errormsg)"; - } $this->ERROR = $errormsg; if ( MAGPIE_DEBUG ) { trigger_error( $errormsg, $lvl); diff --git a/wp-includes/version.php b/wp-includes/version.php index f564db6ddb..012ddf9bdb 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.5-alpha-47901'; +$wp_version = '5.5-alpha-47902'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.