Changeset 31188

Timestamp:

01/16/2015 01:05:52 AM (12 years ago)

Author:

wonderboymusic

Message:

In PHP 5.0.0, is_a() became deprecated in favour of the instanceof operator. Calling is_a() would result in an E_STRICT warning.

In PHP 5.3.0, is_a() is no longer deprecated, and will therefore no longer throw E_STRICT warnings.

To avoid warnings in PHP < 5.3.0, convert all is_a() calls to $var instanceof WP_Class calls.

instanceof does not throw any error if the variable being tested is not an object, it simply returns false.

Props markoheijnen, wonderboymusic.
Fixes #25672.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-users-list-table.php (modified) (1 diff)
• wp-admin/includes/screen.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/includes/theme.php (modified) (1 diff)
• wp-includes/capabilities.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/class-feed.php (modified) (1 diff)
• wp-includes/class-wp-customize-manager.php (modified) (4 diffs)
• wp-includes/class-wp-error.php (modified) (1 diff)
• wp-includes/class-wp-theme.php (modified) (1 diff)
• wp-includes/class-wp-xmlrpc-server.php (modified) (2 diffs)
• wp-includes/compat.php (modified) (2 diffs)
• wp-includes/deprecated.php (modified) (1 diff)
• wp-includes/functions.wp-scripts.php (modified) (7 diffs)
• wp-includes/functions.wp-styles.php (modified) (7 diffs)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (5 diffs)
• wp-includes/template.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)
• wp-includes/user.php (modified) (5 diffs)
• wp-includes/widgets.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-users-list-table.php

@@ -340 +340 @@
                 global $wp_roles;
 
-                if ( !( is_object( $user_object ) && is_a( $user_object, 'WP_User' ) ) )
+                if ( ! ( $user_object instanceof WP_User ) ) {
                         $user_object = get_userdata( (int) $user_object );
+                }
                 $user_object->filter = 'display';
                 $email = $user_object->user_email;

trunk/src/wp-admin/includes/screen.php

@@ -375 +375 @@
         public static function get( $hook_name = '' ) {
 
-                if ( is_a( $hook_name, 'WP_Screen' ) )
+                if ( $hook_name instanceof WP_Screen ) {
                         return $hook_name;
+                }
 
                 $post_type = $taxonomy = null;

trunk/src/wp-admin/includes/template.php

@@ -177 +177 @@
         $r = wp_parse_args( $params, $defaults );
 
-        if ( empty( $r['walker'] ) || ! is_a( $r['walker'], 'Walker' ) ) {
+        if ( empty( $r['walker'] ) || ! ( $r['walker'] instanceof Walker ) ) {
                 $walker = new Walker_Category_Checklist;
         } else {

trunk/src/wp-admin/includes/theme.php

@@ -150 +150 @@
                 $themes_update = get_site_transient('update_themes');
 
-        if ( ! is_a( $theme, 'WP_Theme' ) )
+        if ( ! ( $theme instanceof WP_Theme ) ) {
                 return false;
+        }
 
         $stylesheet = $theme->get_stylesheet();

trunk/src/wp-includes/capabilities.php

@@ -521 +521 @@
                 }
 
-                if ( is_a( $id, 'WP_User' ) ) {
+                if ( $id instanceof WP_User ) {
                         $this->init( $id->data, $blog_id );
                         return;

trunk/src/wp-includes/category-template.php

@@ -883 +883 @@
         $args = func_get_args();
         // the user's options are the third parameter
-        if ( empty($args[2]['walker']) || !is_a($args[2]['walker'], 'Walker') )
+        if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) {
                 $walker = new Walker_Category;
-        else
+        } else {
                 $walker = $args[2]['walker'];
-
+        }
         return call_user_func_array(array( &$walker, 'walk' ), $args );
 }

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

@@ -38 +38 @@
 
         public function save($data) {
-                if ( is_a($data, 'SimplePie') )
+                if ( $data instanceof SimplePie ) {
                         $data = $data->data;
+                }
 
                 set_transient($this->name, $data, $this->lifetime);

trunk/src/wp-includes/class-wp-customize-manager.php

@@ -696 +696 @@
          */
         public function add_setting( $id, $args = array() ) {
-                if ( is_a( $id, 'WP_Customize_Setting' ) )
+                if ( $id instanceof WP_Customize_Setting ) {
                         $setting = $id;
-                else
+                } else {
                         $setting = new WP_Customize_Setting( $this, $id, $args );
-
+                }
                 $this->settings[ $setting->id ] = $setting;
         }
@@ -738 +738 @@
          */
         public function add_panel( $id, $args = array() ) {
-                if ( is_a( $id, 'WP_Customize_Panel' ) ) {
+                if ( $id instanceof WP_Customize_Panel ) {
                         $panel = $id;
-                }
-                else {
+                } else {
                         $panel = new WP_Customize_Panel( $this, $id, $args );
                 }
@@ -784 +783 @@
          */
         public function add_section( $id, $args = array() ) {
-                if ( is_a( $id, 'WP_Customize_Section' ) )
+                if ( $id instanceof WP_Customize_Section ) {
                         $section = $id;
-                else
+                } else {
                         $section = new WP_Customize_Section( $this, $id, $args );
-
+                }
                 $this->sections[ $section->id ] = $section;
         }
@@ -826 +825 @@
          */
         public function add_control( $id, $args = array() ) {
-                if ( is_a( $id, 'WP_Customize_Control' ) )
+                if ( $id instanceof WP_Customize_Control ) {
                         $control = $id;
-                else
+                } else {
                         $control = new WP_Customize_Control( $this, $id, $args );
-
+                }
                 $this->controls[ $control->id ] = $control;
         }

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

@@ -215 +215 @@
  * @return bool True, if WP_Error. False, if not WP_Error.
  */
-function is_wp_error($thing) {
-        if ( is_object($thing) && is_a($thing, 'WP_Error') )
-                return true;
-        return false;
+function is_wp_error( $thing ) {
+        return ( $thing instanceof WP_Error );
 }

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

@@ -275 +275 @@
                 if ( $this->template != $this->stylesheet ) {
                         // If we are a parent, then there is a problem. Only two generations allowed! Cancel things out.
-                        if ( is_a( $_child, 'WP_Theme' ) && $_child->template == $this->stylesheet ) {
+                        if ( $_child instanceof WP_Theme && $_child->template == $this->stylesheet ) {
                                 $_child->parent = null;
                                 $_child->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), $_child->template ) );

trunk/src/wp-includes/class-wp-xmlrpc-server.php

@@ -1118 +1118 @@
 
                 // convert the date field back to IXR form
-                if ( isset( $content_struct['post_date'] ) && ! is_a( $content_struct['post_date'], 'IXR_Date' ) ) {
+                if ( isset( $content_struct['post_date'] ) && ! ( $content_struct['post_date'] instanceof IXR_Date ) ) {
                         $content_struct['post_date'] = $this->_convert_date( $content_struct['post_date'] );
                 }
@@ -1124 +1124 @@
                 // ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
                 // since _insert_post will ignore the non-GMT date if the GMT date is set
-                if ( isset( $content_struct['post_date_gmt'] ) && ! is_a( $content_struct['post_date_gmt'], 'IXR_Date' ) ) {
+                if ( isset( $content_struct['post_date_gmt'] ) && ! ( $content_struct['post_date_gmt'] instanceof IXR_Date ) ) {
                         if ( $content_struct['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) {
                                 unset( $content_struct['post_date_gmt'] );

trunk/src/wp-includes/compat.php

@@ -66 +66 @@
                 global $wp_json;
 
-                if ( !is_a($wp_json, 'Services_JSON') ) {
+                if ( ! ( $wp_json instanceof Services_JSON ) ) {
                         require_once( ABSPATH . WPINC . '/class-json.php' );
                         $wp_json = new Services_JSON();
@@ -79 +79 @@
                 global $wp_json;
 
-                if ( !is_a($wp_json, 'Services_JSON') ) {
+                if ( ! ($wp_json instanceof Services_JSON ) ) {
                         require_once( ABSPATH . WPINC . '/class-json.php' );
                         $wp_json = new Services_JSON();

trunk/src/wp-includes/deprecated.php

@@ -2685 +2685 @@
                 if ( !isset($user->ID) )
                         $user->ID = 0;
-                if ( !is_a( $user, 'WP_User' ) ) {
+                if ( ! ( $user instanceof WP_User ) ) {
                         $vars = get_object_vars($user);
                         foreach ( array_keys($vars) as $field ) {

trunk/src/wp-includes/functions.wp-scripts.php

@@ -36 +36 @@
 
         global $wp_scripts;
-        if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -73 +73 @@
 function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
         global $wp_scripts;
-        if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -116 +116 @@
 function wp_localize_script( $handle, $object_name, $l10n ) {
         global $wp_scripts;
-        if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -142 +142 @@
 function wp_deregister_script( $handle ) {
         global $wp_scripts;
-        if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -198 +198 @@
 function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
         global $wp_scripts;
-        if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -230 +230 @@
 function wp_dequeue_script( $handle ) {
         global $wp_scripts;
-        if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -255 +255 @@
 function wp_script_is( $handle, $list = 'enqueued' ) {
         global $wp_scripts;
-        if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+        if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),

trunk/src/wp-includes/functions.wp-styles.php

@@ -35 +35 @@
 
         global $wp_styles;
-        if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+        if ( ! ( $wp_styles instanceof WP_Styles ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -68 +68 @@
 function wp_add_inline_style( $handle, $data ) {
         global $wp_styles;
-        if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+        if ( ! ( $wp_styles instanceof WP_Styles ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -103 +103 @@
 function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media = 'all' ) {
         global $wp_styles;
-        if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+        if ( ! ( $wp_styles instanceof WP_Styles ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -125 +125 @@
 function wp_deregister_style( $handle ) {
         global $wp_styles;
-        if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+        if ( ! ( $wp_styles instanceof WP_Styles ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -158 +158 @@
 function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) {
         global $wp_styles;
-        if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+        if ( ! ( $wp_styles instanceof WP_Styles ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -184 +184 @@
 function wp_dequeue_style( $handle ) {
         global $wp_styles;
-        if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+        if ( ! ( $wp_styles instanceof WP_Styles ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -208 +208 @@
 function wp_style_is( $handle, $list = 'enqueued' ) {
         global $wp_styles;
-        if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+        if ( ! ( $wp_styles instanceof WP_Styles ) ) {
                 if ( ! did_action( 'init' ) )
                         _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),

trunk/src/wp-includes/general-template.php

@@ -2850 +2850 @@
 function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
         global $wp_styles;
-        if ( !is_a($wp_styles, 'WP_Styles') )
+        if ( ! ( $wp_styles instanceof WP_Styles ) ) {
                 $wp_styles = new WP_Styles();
+        }
 
         // For backward compatibility

trunk/src/wp-includes/ms-functions.php

@@ -2006 +2006 @@
  */
 function is_user_spammy( $user = null ) {
-    if ( ! is_a( $user, 'WP_User' ) ) {
-                if ( $user )
+    if ( ! ( $user instanceof WP_User ) ) {
+                if ( $user ) {
                         $user = get_user_by( 'login', $user );
-                else
+                } else {
                         $user = wp_get_current_user();
+                }
         }
 

trunk/src/wp-includes/pluggable.php

@@ -261 +261 @@
 
         // (Re)create it, if it's gone missing
-        if ( !is_object( $phpmailer ) || !is_a( $phpmailer, 'PHPMailer' ) ) {
+        if ( ! ( $phpmailer instanceof PHPMailer ) ) {
                 require_once ABSPATH . WPINC . '/class-phpmailer.php';
                 require_once ABSPATH . WPINC . '/class-smtp.php';

trunk/src/wp-includes/post.php

@@ -423 +423 @@
                 $post = $GLOBALS['post'];
 
-        if ( is_a( $post, 'WP_Post' ) ) {
+        if ( $post instanceof WP_Post ) {
                 $_post = $post;
         } elseif ( is_object( $post ) ) {

trunk/src/wp-includes/script-loader.php

@@ -779 +779 @@
         }
 
-        if ( !is_a($wp_scripts, 'WP_Scripts') )
+        if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
                 $wp_scripts = new WP_Scripts();
+        }
 
         script_concat_settings();
@@ -809 +810 @@
         global $wp_scripts, $concatenate_scripts;
 
-        if ( !is_a($wp_scripts, 'WP_Scripts') )
+        if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
                 return array(); // No need to run if not instantiated.
-
+        }
         script_concat_settings();
         $wp_scripts->do_concat = $concatenate_scripts;
@@ -893 +894 @@
         global $wp_scripts;
 
-        if ( !is_a($wp_scripts, 'WP_Scripts') )
+        if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
                 return array(); // no need to run if nothing is queued
-
+        }
         return print_head_scripts();
 }
@@ -948 +949 @@
         global $wp_styles, $concatenate_scripts;
 
-        if ( !is_a($wp_styles, 'WP_Styles') )
+        if ( ! ( $wp_styles instanceof WP_Styles ) ) {
                 $wp_styles = new WP_Styles();
+        }
 
         script_concat_settings();
@@ -978 +980 @@
         global $wp_styles, $concatenate_scripts;
 
-        if ( !is_a($wp_styles, 'WP_Styles') )
+        if ( ! ( $wp_styles instanceof WP_Styles ) ) {
                 return;
+        }
 
         $wp_styles->do_concat = $concatenate_scripts;

trunk/src/wp-includes/template.php

@@ -136 +136 @@
         $templates = array();
 
-        if ( is_a( $author, 'WP_User' ) ) {
+        if ( $author instanceof WP_User ) {
                 $templates[] = "author-{$author->user_nicename}.php";
                 $templates[] = "author-{$author->ID}.php";

trunk/src/wp-includes/theme.php

@@ -2028 +2028 @@
         global $wp_customize;
 
-        return is_a( $wp_customize, 'WP_Customize_Manager' ) && $wp_customize->is_preview();
-}
+        return ( $wp_customize instanceof WP_Customize_Manager ) && $wp_customize->is_preview();
+}

trunk/src/wp-includes/user.php

@@ -113 +113 @@
  */
 function wp_authenticate_username_password($user, $username, $password) {
-        if ( is_a( $user, 'WP_User' ) ) {
+        if ( $user instanceof WP_User ) {
                 return $user;
         }
@@ -168 +168 @@
  */
 function wp_authenticate_cookie($user, $username, $password) {
-        if ( is_a( $user, 'WP_User' ) ) {
+        if ( $user instanceof WP_User ) {
                 return $user;
         }
@@ -203 +203 @@
  */
 function wp_authenticate_spam_check( $user ) {
-        if ( $user && is_a( $user, 'WP_User' ) && is_multisite() ) {
+        if ( $user instanceof WP_User && is_multisite() ) {
                 /**
                  * Filter whether the user has been marked as a spammer.
@@ -1711 +1711 @@
         global $wpdb;
 
-        if ( is_a( $userdata, 'stdClass' ) ) {
+        if ( $userdata instanceof stdClass ) {
                 $userdata = get_object_vars( $userdata );
-        } elseif ( is_a( $userdata, 'WP_User' ) ) {
+        } elseif ( $userdata instanceof WP_User ) {
                 $userdata = $userdata->to_array();
         }
@@ -1970 +1970 @@
  */
 function wp_update_user($userdata) {
-        if ( is_a( $userdata, 'stdClass' ) )
+        if ( $userdata instanceof stdClass ) {
                 $userdata = get_object_vars( $userdata );
-        elseif ( is_a( $userdata, 'WP_User' ) )
+        } elseif ( $userdata instanceof WP_User ) {
                 $userdata = $userdata->to_array();
+        }
 
         $ID = (int) $userdata['ID'];

trunk/src/wp-includes/widgets.php

@@ -1553 +1553 @@
 
         $widget_obj = $wp_widget_factory->widgets[$widget];
-        if ( !is_a($widget_obj, 'WP_Widget') )
+        if ( ! ( $widget_obj instanceof WP_Widget ) ) {
                 return;
+        }
 
         $before_widget = sprintf('<div class="widget %s">', $widget_obj->widget_options['classname'] );