Changeset 45185

Timestamp:

04/12/2019 11:55:19 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Plugins: Introduce is_wp_version_compatible() and is_php_version_compatible() for checking compatibility with the current WordPress or PHP version.

Props afragen.
Fixes #46599.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-plugins-list-table.php (modified) (1 diff)
• wp-admin/includes/plugin-install.php (modified) (1 diff)
• wp-admin/includes/plugin.php (modified) (1 diff)
• wp-admin/includes/update.php (modified) (1 diff)
• wp-admin/update-core.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

@@ -503 +503 @@
             }
 
-            $wp_version = get_bloginfo( 'version' );
-
-            $compatible_php = ( empty( $plugin['requires_php'] ) || version_compare( phpversion(), $plugin['requires_php'], '>=' ) );
-            $tested_wp      = ( empty( $plugin['tested'] ) || version_compare( $wp_version, $plugin['tested'], '<=' ) );
-            $compatible_wp  = ( empty( $plugin['requires'] ) || version_compare( $wp_version, $plugin['requires'], '>=' ) );
+            $requires_php = isset( $plugin['requires_php'] ) ? $plugin['requires_php'] : null;
+            $requires_wp  = isset( $plugin['requires'] ) ? $plugin['requires'] : null;
+
+            $compatible_php = is_php_version_compatible( $requires_php );
+            $compatible_wp  = is_wp_version_compatible( $requires_wp );
+            $tested_wp      = ( empty( $plugin['tested'] ) || version_compare( get_bloginfo( 'version' ), $plugin['tested'], '<=' ) );
 
             $action_links = array();

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -762 +762 @@
         }
 
-        $compatible_php = ( empty( $plugin_data['requires_php'] ) || version_compare( phpversion(), $plugin_data['requires_php'], '>=' ) );
+        $requires_php   = isset( $plugin['requires_php'] ) ? $plugin['requires_php'] : null;
+        $compatible_php = is_php_version_compatible( $requires_php );
         $class          = $is_active ? 'active' : 'inactive';
         $checkbox_id    = 'checkbox_' . md5( $plugin_data['Name'] );

trunk/src/wp-admin/includes/plugin-install.php

@@ -755 +755 @@
     <div id="section-holder" class="wrap">
     <?php
-    $wp_version = get_bloginfo( 'version' );
-
-    $compatible_php = ( empty( $api->requires_php ) || version_compare( phpversion(), $api->requires_php, '>=' ) );
-    $tested_wp      = ( empty( $api->tested ) || version_compare( $wp_version, $api->tested, '<=' ) );
-    $compatible_wp  = ( empty( $api->requires ) || version_compare( $wp_version, $api->requires, '>=' ) );
+    $requires_php = isset( $api->requires_php ) ? $api->requires_php : null;
+    $requires_wp  = isset( $api->requires ) ? $api->requires : null;
+
+    $compatible_php = is_php_version_compatible( $requires_php );
+    $compatible_wp  = is_wp_version_compatible( $requires_wp );
+    $tested_wp      = ( empty( $api->tested ) || version_compare( get_bloginfo( 'version' ), $api->tested, '<=' ) );
 
     if ( ! $compatible_php ) {

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

@@ -1100 +1100 @@
     }
 
-    $plugin_data['wp_compatible']  = version_compare( get_bloginfo( 'version' ), $plugin_data['requires'], '>=' );
-    $plugin_data['php_compatible'] = version_compare( phpversion(), $plugin_data['requires_php'], '>=' );
+    $plugin_data['wp_compatible']  = is_wp_version_compatible( $plugin_data['requires'] );
+    $plugin_data['php_compatible'] = is_php_version_compatible( $plugin_data['requires_php'] );
 
     $plugin_data = array_merge( $plugin_data, get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) );

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

@@ -401 +401 @@
         }
 
-        $compatible_php = ( empty( $response->requires_php ) || version_compare( phpversion(), $response->requires_php, '>=' ) );
+        $requires_php   = isset( $response->requires_php ) ? $response->requires_php : null;
+        $compatible_php = is_php_version_compatible( $requires_php );
         $notice_type    = $compatible_php ? 'notice-warning' : 'notice-error';
 

trunk/src/wp-admin/update-core.php

@@ -296 +296 @@
         }
 
-        $compatible_php = ( empty( $plugin_data->update->requires_php ) || version_compare( phpversion(), $plugin_data->update->requires_php, '>=' ) );
+        $requires_php   = isset( $plugin_data->update->requires_php ) ? $plugin_data->update->requires_php : null;
+        $compatible_php = is_php_version_compatible( $requires_php );
 
         if ( ! $compatible_php && current_user_can( 'update_php' ) ) {

trunk/src/wp-includes/functions.php

@@ -3418 +3418 @@
     <data>
         <status>{$r['response']}</status>
-    </data> 
+    </data>
 </error>
 
@@ -7122 +7122 @@
     return $size;
 }
+
+/**
+* Checks compatibility with the current WordPress version.
+*
+* @since 5.2.0
+*
+* @param string $required Minimum required WordPress version.
+* @return bool True if required version is compatible or empty, false if not.
+*/
+function is_wp_version_compatible( $required ) {
+    return empty( $required ) || version_compare( get_bloginfo( 'version' ), $required, '>=' );
+}
+
+/**
+ * Checks compatibility with the current PHP version.
+ *
+ * @since 5.2.0
+ *
+ * @param string $required Minimum required PHP version.
+ * @return bool True if required version is compatible or empty, false if not.
+ */
+function is_php_version_compatible( $required ) {
+    return empty( $required ) || version_compare( phpversion(), $required, '>=' );
+}