Changeset 58843

Timestamp:

08/02/2024 10:36:27 PM (4 months ago)

Author:

peterwilsoncc

Message:

General: Use clean WordPress version in is_wp_version_compatible().

Update is_wp_version_compatible() to use wp_get_wp_version() introduced in [58813] to ensure the value of $wp_version has not been modified by a theme or plugin.

Props costdev, mukesh27, Cybr, sergeybiryukov.
Fixes #61781.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (2 diffs)
• tests/phpunit/tests/functions/isWpVersionCompatible.php (modified) (8 diffs)

trunk/src/wp-includes/functions.php

@@ -8834 +8834 @@
  * @since 5.2.0
  *
- * @global string $wp_version The WordPress version string.
+ * @global string $_wp_tests_wp_version The WordPress version string. Used only in Core tests.
  *
  * @param string $required Minimum required WordPress version.
@@ -8840 +8840 @@
  */
 function is_wp_version_compatible( $required ) {
-    global $wp_version;
+    if (
+        defined( 'WP_RUN_CORE_TESTS' )
+        && WP_RUN_CORE_TESTS
+        && isset( $GLOBALS['_wp_tests_wp_version'] )
+    ) {
+        $wp_version = $GLOBALS['_wp_tests_wp_version'];
+    } else {
+        $wp_version = wp_get_wp_version();
+    }
 
     // Strip off any -alpha, -RC, -beta, -src suffixes.

trunk/tests/phpunit/tests/functions/isWpVersionCompatible.php

@@ -10 +10 @@
 class Tests_Functions_IsWpVersionCompatible extends WP_UnitTestCase {
     /**
+     * The current WordPress version.
+     *
+     * @var string
+     */
+    private static $wp_version;
+
+    /**
+     * Sets the test WordPress version property and global before any tests run.
+     */
+    public static function set_up_before_class() {
+        parent::set_up_before_class();
+        self::$wp_version                = wp_get_wp_version();
+        $GLOBALS['_wp_tests_wp_version'] = self::$wp_version;
+    }
+
+    /**
+     * Resets the test WordPress version global after each test runs.
+     */
+    public function tear_down() {
+        $GLOBALS['_wp_tests_wp_version'] = self::$wp_version;
+        parent::tear_down();
+    }
+
+    /**
+     * Unsets the test WordPress version global after all tests run.
+     */
+    public static function tear_down_after_class() {
+        unset( $GLOBALS['_wp_tests_wp_version'] );
+        parent::tear_down_after_class();
+    }
+
+    /**
      * Tests is_wp_version_compatible().
      *
@@ -15 +47 @@
      *
      * @ticket 54257
+     * @ticket 61781
      *
      * @param mixed $required The minimum required WordPress version.
@@ -29 +62 @@
      */
     public function data_is_wp_version_compatible() {
-        global $wp_version;
-
+        $wp_version     = wp_get_wp_version();
         $version_parts  = explode( '.', $wp_version );
         $lower_version  = $version_parts;
@@ -105 +137 @@
      *
      * @ticket 59448
+     * @ticket 61781
      *
      * @param mixed  $required The minimum required WordPress version.
@@ -111 +144 @@
      */
     public function test_is_wp_version_compatible_should_gracefully_handle_trailing_point_zero_version_numbers( $required, $wp, $expected ) {
-        global $wp_version;
-        $original_version = $wp_version;
-        $wp_version       = $wp;
-
-        $actual = is_wp_version_compatible( $required );
-
-        // Reset the version before the assertion in case of failure.
-        $wp_version = $original_version;
-
-        $this->assertSame( $expected, $actual, 'The expected result was not returned.' );
+        $GLOBALS['_wp_tests_wp_version'] = $wp;
+        $this->assertSame( $expected, is_wp_version_compatible( $required ), 'The expected result was not returned.' );
     }
 
@@ -184 +209 @@
      *
      * @ticket 54257
+     * @ticket 61781
      *
      * @param string $required  The minimum required WordPress version.
@@ -190 +216 @@
      */
     public function test_is_wp_version_compatible_with_development_versions( $required, $wp, $expected ) {
-        global $wp_version;
-
-        $original_version = $wp_version;
-        $wp_version       = $wp;
-        $actual           = is_wp_version_compatible( $required );
-
-        // Reset the version before the assertion in case of failure.
-        $wp_version = $original_version;
-
-        $this->assertSame( $expected, $actual );
+        $GLOBALS['_wp_tests_wp_version'] = $wp;
+        $this->assertSame( $expected, is_wp_version_compatible( $required ) );
     }
 
@@ -208 +226 @@
      */
     public function data_is_wp_version_compatible_with_development_versions() {
-        global $wp_version;
-
         // For consistent results, remove possible suffixes.
-        list( $version ) = explode( '-', $wp_version );
+        list( $version ) = explode( '-', wp_get_wp_version() );
 
         $version_parts  = explode( '.', $version );