Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-24 09:11:24 +01:00
Code Issues Projects Releases Wiki Activity

Code Modernization: Use instanceof instead of a comparison with get_class().

Browse Source 
Includes adjusting external libraries which are no longer maintained externally.

Props jrf.
See #50767.
Built from https://develop.svn.wordpress.org/trunk@49194


git-svn-id: http://core.svn.wordpress.org/trunk@48956 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-10-18 17:33:07 +00:00
parent 0e3147c40e
commit 1faa241fb6
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/class-pclzip.php
View File

@ -1171,7 +1171,7 @@
$this->privErrorReset(); $this->privErrorReset();
// ----- Look if the $p_archive is a PclZip object // ----- 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 // ----- Duplicate the archive
@ -1235,7 +1235,7 @@
} }
// ----- Look if the $p_archive_to_add is a PclZip object // ----- 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 // ----- Merge the archive

2
wp-includes/Text/Diff.php
View File

@ -276,7 +276,7 @@ class Text_Diff {
$prevtype = null; $prevtype = null;
foreach ($this->_edits as $edit) { foreach ($this->_edits as $edit) {
if ($prevtype == get_class($edit)) { if ($edit instanceof $prevtype) {
trigger_error("Edit sequence is non-optimal", E_USER_ERROR); trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
} }
$prevtype = get_class($edit); $prevtype = get_class($edit);

2
wp-includes/class-json.php
View File

@ -918,7 +918,7 @@ class Services_JSON
if (class_exists('pear')) { if (class_exists('pear')) {
return PEAR::isError($data, $code); 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'))) { is_subclass_of($data, 'services_json_error'))) {
return true; return true;
} }

2
wp-includes/rest-api.php
View File

@ -2390,7 +2390,7 @@ function rest_get_route_for_term( $term ) {
$route = ''; $route = '';
// The only controller that works is the Terms controller. // 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'; $namespace = 'wp/v2';
$rest_base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name; $rest_base = ! empty( $taxonomy->rest_base ) ? $taxonomy->rest_base : $taxonomy->name;
$route = sprintf( '/%s/%s/%d', $namespace, $rest_base, $term->term_id ); $route = sprintf( '/%s/%s/%d', $namespace, $rest_base, $term->term_id );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-alpha-49193'; $wp_version = '5.6-alpha-49194';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.