Changeset 49194

Timestamp:

10/18/2020 05:31:37 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk/src

Files:

• wp-admin/includes/class-pclzip.php (modified) (2 diffs)
• wp-includes/Text/Diff.php (modified) (1 diff)
• wp-includes/class-json.php (modified) (1 diff)
• wp-includes/rest-api.php (modified) (1 diff)

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

@@ -1172 +1172 @@
 
     // ----- 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)
     {
 
@@ -1236 +1236 @@
 
     // ----- 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)
     {
 

trunk/src/wp-includes/Text/Diff.php

@@ -277 +277 @@
         $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);
             }

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

@@ -919 +919 @@
         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;

trunk/src/wp-includes/rest-api.php

@@ -2391 +2391 @@
 
     // 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;