Changeset 47902

Timestamp:

06/03/2020 05:38:56 PM (6 years ago)

Author:

desrosj

Message:

General: Continuing to work towards a passing PHP Compatibility scan.

This is a final pass to fix PHP compatibiilty issues in the codebase with code changes or adding phpcs:ignore comments.

With this change, all PHP compatibility warnings and errors without specific tickets have been addressed (see #49810 and #41750).

Props desrosj, johnbillion, jrf.
See #49922.

Location:

trunk

Files:

• phpcompat.xml.dist (modified) (1 diff)
• src/wp-admin/includes/class-ftp.php (modified) (1 diff)
• src/wp-includes/ID3/module.audio-video.quicktime.php (modified) (1 diff)
• src/wp-includes/capabilities.php (modified) (1 diff)
• src/wp-includes/class-requests.php (modified) (2 diffs)
• src/wp-includes/class-simplepie.php (modified) (1 diff)
• src/wp-includes/cron.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (1 diff)
• src/wp-includes/plugin.php (modified) (3 diffs)
• src/wp-includes/pomo/streams.php (modified) (1 diff)
• src/wp-includes/rss.php (modified) (2 diffs)

trunk/phpcompat.xml.dist

@@ -75 +75 @@
 
         <!-- Whitelist the WP DB Class for use of `mysql_` extension in PHP < 7.0. -->
-        <rule ref="PHPCompatibility.Extensions.RemovedExtensions">
+        <rule ref="PHPCompatibility.Extensions.RemovedExtensions.mysql_DeprecatedRemoved">
                 <exclude-pattern>/src/wp-includes/wp-db\.php</exclude-pattern>
         </rule>

trunk/src/wp-admin/includes/class-ftp.php

@@ -900 +900 @@
 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' );
 }

trunk/src/wp-includes/ID3/module.audio-video.quicktime.php

@@ -115 +115 @@
                                 $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

trunk/src/wp-includes/capabilities.php

@@ -291 +291 @@
                 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 );

trunk/src/wp-includes/class-requests.php

@@ -188 +188 @@
                 // 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
@@ -215 +216 @@
                 }
 
-                return new self::$transport[$cap_string]();
+                $class = self::$transport[$cap_string];
+                return new $class();
         }
 

trunk/src/wp-includes/class-simplepie.php

@@ -3166 +3166 @@
 
                 $class = get_class($this);
-                $trace = debug_backtrace();
+                $trace = debug_backtrace(); // phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection
                 $file = $trace[0]['file'];
                 $line = $trace[0]['line'];

trunk/src/wp-includes/cron.php

@@ -403 +403 @@
         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
         }
 

trunk/src/wp-includes/functions.php

@@ -6628 +6628 @@
 
         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
         }
 

trunk/src/wp-includes/plugin.php

@@ -232 +232 @@
         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 );
         }
@@ -454 +454 @@
         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 );
         }
@@ -527 +527 @@
         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 );
         }

trunk/src/wp-includes/pomo/streams.php

@@ -19 +19 @@
                  */
                 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;
                 }

trunk/src/wp-includes/rss.php

@@ -386 +386 @@
 
         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);
@@ -822 +818 @@
 \*=======================================================================*/
         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 ) {