From 422a9049b5979c30120859d343e1f052bca7950d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 18 Oct 2020 17:31:37 +0000 Subject: [PATCH] Code Modernization: Use `instanceof` instead of a comparison with `get_class()`. Includes adjusting external libraries which are no longer maintained externally. Props jrf. See #50767. git-svn-id: https://develop.svn.wordpress.org/trunk@49194 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/class-pclzip.php | 4 ++-- src/wp-includes/Text/Diff.php | 2 +- src/wp-includes/class-json.php | 2 +- src/wp-includes/rest-api.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wp-admin/includes/class-pclzip.php b/src/wp-admin/includes/class-pclzip.php index 47f2a344a2..8a085f8bd0 100644 --- a/src/wp-admin/includes/class-pclzip.php +++ b/src/wp-admin/includes/class-pclzip.php @@ -1171,7 +1171,7 @@ $this->privErrorReset(); // ----- Look if the $p_archive is a PclZip object - if ((is_object($p_archive)) && (get_class($p_archive) == 'pclzip')) + if (is_object($p_archive) && $p_archive instanceof pclzip) { // ----- Duplicate the archive @@ -1235,7 +1235,7 @@ } // ----- Look if the $p_archive_to_add is a PclZip object - if ((is_object($p_archive_to_add)) && (get_class($p_archive_to_add) == 'pclzip')) + if (is_object($p_archive_to_add) && $p_archive_to_add instanceof pclzip) { // ----- Merge the archive diff --git a/src/wp-includes/Text/Diff.php b/src/wp-includes/Text/Diff.php index ab1c9a26dd..61a9320a0e 100644 --- a/src/wp-includes/Text/Diff.php +++ b/src/wp-includes/Text/Diff.php @@ -276,7 +276,7 @@ class Text_Diff { $prevtype = null; foreach ($this->_edits as $edit) { - if ($prevtype == get_class($edit)) { + if ($edit instanceof $prevtype) { trigger_error("Edit sequence is non-optimal", E_USER_ERROR); } $prevtype = get_class($edit); diff --git a/src/wp-includes/class-json.php b/src/wp-includes/class-json.php index 66443e1068..036150f1d8 100644 --- a/src/wp-includes/class-json.php +++ b/src/wp-includes/class-json.php @@ -918,7 +918,7 @@ class Services_JSON if (class_exists('pear')) { return PEAR::isError($data, $code); - } elseif (is_object($data) && (get_class($data) == 'services_json_error' || + } elseif (is_object($data) && ($data instanceof services_json_error || is_subclass_of($data, 'services_json_error'))) { return true; } diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php index bbbeae3532..ed62943309 100644 --- a/src/wp-includes/rest-api.php +++ b/src/wp-includes/rest-api.php @@ -2390,7 +2390,7 @@ function rest_get_route_for_term( $term ) { $route = ''; // The only controller that works is the Terms controller. - if ( 'WP_REST_Terms_Controller' === get_class( $controller ) ) { + if ( $controller instanceof WP_REST_Terms_Controller ) { $namespace = 'wp/v2'; $rest_base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name; $route = sprintf( '/%s/%s/%d', $namespace, $rest_base, $term->term_id );