From 3ec2d2fcfae0cad2144d21b5ca7d8243b06bf245 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 31 Dec 2021 13:55:03 +0000 Subject: [PATCH] Build/Test Tools: Update PHPCompatibilityWP to version 2.1.3. The latest release takes the new polyfills added in WordPress 5.9 into account. This commit also removes redundant inline ignore comments for WP-polyfilled functionality. The PHPCompatibilityWP ruleset explicitly excludes those polyfills, so they don't need to be annotated as ignored. Release notes: https://github.com/PHPCompatibility/PHPCompatibilityWP/releases/tag/2.1.3 For a full list of changes in this update, see the PHPCompatibilityWP GitHub: https://github.com/PHPCompatibility/PHPCompatibilityWP/compare/2.1.2...2.1.3 Follow-up to [46290], [51543]. Props jrf. Fixes #54711. Built from https://develop.svn.wordpress.org/trunk@52425 git-svn-id: http://core.svn.wordpress.org/trunk@52017 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/file.php | 3 --- wp-admin/includes/image.php | 2 +- wp-includes/class-wp-image-editor-gd.php | 2 +- wp-includes/compat.php | 2 +- wp-includes/deprecated.php | 2 +- wp-includes/media.php | 2 +- wp-includes/version.php | 2 +- 7 files changed, 6 insertions(+), 9 deletions(-) diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index b26596250e..1fbfe39678 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -1384,7 +1384,6 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f ), array( 'php' => phpversion(), - // phpcs:ignore PHPCompatibility.Constants.NewConstants.sodium_library_versionFound 'sodium' => defined( 'SODIUM_LIBRARY_VERSION' ) ? SODIUM_LIBRARY_VERSION : ( defined( 'ParagonIE_Sodium_Compat::VERSION_STRING' ) ? ParagonIE_Sodium_Compat::VERSION_STRING : false ), ) ); @@ -1417,7 +1416,6 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f ), array( 'php' => phpversion(), - // phpcs:ignore PHPCompatibility.Constants.NewConstants.sodium_library_versionFound 'sodium' => defined( 'SODIUM_LIBRARY_VERSION' ) ? SODIUM_LIBRARY_VERSION : ( defined( 'ParagonIE_Sodium_Compat::VERSION_STRING' ) ? ParagonIE_Sodium_Compat::VERSION_STRING : false ), 'polyfill_is_fast' => false, 'max_execution_time' => ini_get( 'max_execution_time' ), @@ -1491,7 +1489,6 @@ function verify_file_signature( $filename, $signatures, $filename_for_errors = f 'skipped_key' => $skipped_key, 'skipped_sig' => $skipped_signature, 'php' => phpversion(), - // phpcs:ignore PHPCompatibility.Constants.NewConstants.sodium_library_versionFound 'sodium' => defined( 'SODIUM_LIBRARY_VERSION' ) ? SODIUM_LIBRARY_VERSION : ( defined( 'ParagonIE_Sodium_Compat::VERSION_STRING' ) ? ParagonIE_Sodium_Compat::VERSION_STRING : false ), ) ); diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php index 4d6e99f749..627fdfb4b5 100644 --- a/wp-admin/includes/image.php +++ b/wp-admin/includes/image.php @@ -947,7 +947,7 @@ function file_is_valid_image( $path ) { * @return bool True if suitable, false if not suitable. */ function file_is_displayable_image( $path ) { - $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO, IMAGETYPE_WEBP ); // phpcs:ignore PHPCompatibility.Constants.NewConstants.imagetype_webpFound + $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO, IMAGETYPE_WEBP ); $info = wp_getimagesize( $path ); if ( empty( $info ) ) { diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php index f175b90d20..f32e2b4202 100644 --- a/wp-includes/class-wp-image-editor-gd.php +++ b/wp-includes/class-wp-image-editor-gd.php @@ -70,7 +70,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor { case 'image/gif': return ( $image_types & IMG_GIF ) != 0; case 'image/webp': - return ( $image_types & IMG_WEBP ) != 0; // phpcs:ignore PHPCompatibility.Constants.NewConstants.img_webpFound + return ( $image_types & IMG_WEBP ) != 0; } return false; diff --git a/wp-includes/compat.php b/wp-includes/compat.php index 02eb4eb6dc..ac78f7f9a3 100644 --- a/wp-includes/compat.php +++ b/wp-includes/compat.php @@ -485,5 +485,5 @@ if ( ! defined( 'IMAGETYPE_WEBP' ) ) { // IMG_WEBP constant is only defined in PHP 7.0.10 or later. if ( ! defined( 'IMG_WEBP' ) ) { - define( 'IMG_WEBP', IMAGETYPE_WEBP ); // phpcs:ignore PHPCompatibility.Constants.NewConstants.imagetype_webpFound + define( 'IMG_WEBP', IMAGETYPE_WEBP ); } diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index dcce1c1cea..7f29f9dcb6 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -3325,7 +3325,7 @@ function gd_edit_image_support($mime_type) { case 'image/gif': return (imagetypes() & IMG_GIF) != 0; case 'image/webp': - return (imagetypes() & IMG_WEBP) != 0; // phpcs:ignore PHPCompatibility.Constants.NewConstants.img_webpFound + return (imagetypes() & IMG_WEBP) != 0; } } else { switch( $mime_type ) { diff --git a/wp-includes/media.php b/wp-includes/media.php index c7ef8bab5d..0daff31b37 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -5196,7 +5196,7 @@ function wp_getimagesize( $filename, array &$image_info = null ) { return array( $width, $height, - IMAGETYPE_WEBP, // phpcs:ignore PHPCompatibility.Constants.NewConstants.imagetype_webpFound + IMAGETYPE_WEBP, sprintf( 'width="%d" height="%d"', $width, diff --git a/wp-includes/version.php b/wp-includes/version.php index b8ec0108b9..9c58def517 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '5.9-beta4-52424'; +$wp_version = '5.9-beta4-52425'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.