Changeset 52425

Timestamp:

12/31/2021 01:53:19 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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.

Location:

trunk

Files:

• composer.json (modified) (1 diff)
• src/wp-admin/includes/file.php (modified) (3 diffs)
• src/wp-admin/includes/image.php (modified) (1 diff)
• src/wp-includes/class-wp-image-editor-gd.php (modified) (1 diff)
• src/wp-includes/compat.php (modified) (1 diff)
• src/wp-includes/deprecated.php (modified) (1 diff)
• src/wp-includes/media.php (modified) (1 diff)

trunk/composer.json

@@ -17 +17 @@
                 "squizlabs/php_codesniffer": "3.6.0",
                 "wp-coding-standards/wpcs": "~2.3.0",
-                "phpcompatibility/phpcompatibility-wp": "~2.1.2",
+                "phpcompatibility/phpcompatibility-wp": "~2.1.3",
                 "yoast/phpunit-polyfills": "^1.0.1"
         },

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

@@ -1385 +1385 @@
                         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 ),
                         )
@@ -1418 +1417 @@
                                 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,
@@ -1492 +1490 @@
                         '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 ),
                 )

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

@@ -948 +948 @@
  */
 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 );

trunk/src/wp-includes/class-wp-image-editor-gd.php

@@ -71 +71 @@
                                 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;
                 }
 

trunk/src/wp-includes/compat.php

@@ -486 +486 @@
 // 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 );
+}

trunk/src/wp-includes/deprecated.php

@@ -3326 +3326 @@
                                 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 {

trunk/src/wp-includes/media.php

@@ -5197 +5197 @@
                                 $width,
                                 $height,
-                                IMAGETYPE_WEBP, // phpcs:ignore PHPCompatibility.Constants.NewConstants.imagetype_webpFound
+                                IMAGETYPE_WEBP,
                                 sprintf(
                                         'width="%d" height="%d"',