Changeset 54169

Timestamp:

09/14/2022 10:17:53 PM (2 years ago)

Author:

azaozz

Message:

Site health:

• Add a check to wp_check_php_version() whether the current PHP version is lower than the next (desired) minimum version.
• Set the next desired minimum PHP version to 7.2.
• Use that check to update the warnings in the wp_dashboard_php_nag() widget, and on the Site Health screen.

Props Clorith, SergeyBiryukov, ironprogrammer, azaozz.
See #56199.

Location:

trunk/src/wp-admin

Files:

• css/dashboard.css (modified) (2 diffs)
• includes/class-wp-site-health.php (modified) (4 diffs)
• includes/dashboard.php (modified) (4 diffs)
• includes/misc.php (modified) (2 diffs)

trunk/src/wp-admin/css/dashboard.css

@@ -1187 +1187 @@
 }
 
-#dashboard_php_nag.php-insecure .dashicons-warning {
+#dashboard_php_nag.php-no-security-updates .dashicons-warning,
+#dashboard_php_nag.php-version-lower-than-future-minimum .dashicons-warning {
     color: #d63638;
 }
@@ -1199 +1200 @@
 }
 
-#dashboard_php_nag h3 {
-    font-weight: 600;
-}
-
 #dashboard_php_nag .button .dashicons-external {
     line-height: 25px;
+}
+
+.bigger-bolder-text {
+    font-weight: 600;
+    font-size: 14px;
 }
 

trunk/src/wp-admin/includes/class-wp-site-health.php

@@ -742 +742 @@
                 sprintf(
                     /* translators: %s: The minimum recommended PHP version. */
-                    __( 'PHP is the programming language used to build and maintain WordPress. Newer versions of PHP are created with increased performance in mind, so you may see a positive effect on your site’s performance. The minimum recommended version of PHP is %s.' ),
+                    __( 'PHP is one of the programming languages used to build WordPress. Newer versions of PHP receive regular security updates and may increase your site’s performance. The minimum recommended version of PHP is %s.' ),
                     $response ? $response['recommended_version'] : ''
                 )
@@ -765 +765 @@
             $result['label'] = sprintf(
                 /* translators: %s: The server PHP version. */
-                __( 'Your site is running an older version of PHP (%s)' ),
+                __( 'Your site is running on an older version of PHP (%s)' ),
                 PHP_VERSION
             );
             $result['status'] = 'recommended';
+
+            return $result;
+        }
+
+        // The PHP version is still receiving security fixes, but is lower than
+        // the expected minimum version that will be required by WordPress in the near future.
+        if ( $response['is_secure'] && $response['is_lower_than_future_minimum'] ) {
+            // The `is_secure` array key name doesn't actually imply this is a secure version of PHP. It only means it receives security updates.
+
+            $result['label'] = sprintf(
+                /* translators: %s: The server PHP version. */
+                __( 'Your site is running on an outdated version of PHP (%s), which soon will not be supported by WordPress.' ),
+                PHP_VERSION
+            );
+
+            $result['status']         = 'critical';
+            $result['badge']['label'] = __( 'Requirements' );
 
             return $result;
@@ -777 +794 @@
             $result['label'] = sprintf(
                 /* translators: %s: The server PHP version. */
-                __( 'Your site is running an older version of PHP (%s), which should be updated' ),
+                __( 'Your site is running on an older version of PHP (%s), which should be updated' ),
                 PHP_VERSION
             );
@@ -785 +802 @@
         }
 
-        // Anything no longer secure must be updated.
-        $result['label'] = sprintf(
-            /* translators: %s: The server PHP version. */
-            __( 'Your site is running an outdated version of PHP (%s), which requires an update' ),
-            PHP_VERSION
-        );
-        $result['status']         = 'critical';
+        // No more security updates for the PHP version, and lower than the expected minimum version required by WordPress.
+        if ( $response['is_lower_than_future_minimum'] ) {
+            $message = sprintf(
+                /* translators: %s: The server PHP version. */
+                __( 'Your site is running on an outdated version of PHP (%s), which does not receive security updates and soon will not be supported by WordPress.' ),
+                PHP_VERSION
+            );
+        } else {
+            // No more security updates for the PHP version, must be updated.
+            $message = sprintf(
+                /* translators: %s: The server PHP version. */
+                __( 'Your site is running on an outdated version of PHP (%s), which does not receive security updates. It should be updated.' ),
+                PHP_VERSION
+            );
+        }
+
+        $result['label']  = $message;
+        $result['status'] = 'critical';
+
         $result['badge']['label'] = __( 'Security' );
 

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

@@ -21 +21 @@
     global $wp_registered_widgets, $wp_registered_widget_controls, $wp_dashboard_control_callbacks;
 
+    $screen = get_current_screen();
+
+    /* Register Widgets and Controls */
     $wp_dashboard_control_callbacks = array();
-    $screen                         = get_current_screen();
-
-    /* Register Widgets and Controls */
-
-    $response = wp_check_browser_version();
-
-    if ( $response && $response['upgrade'] ) {
+
+    // Browser version
+    $check_browser = wp_check_browser_version();
+
+    if ( $check_browser && $check_browser['upgrade'] ) {
         add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' );
 
-        if ( $response['insecure'] ) {
+        if ( $check_browser['insecure'] ) {
             wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
         } else {
@@ -39 +40 @@
 
     // PHP Version.
-    $response = wp_check_php_version();
-
-    if ( $response && isset( $response['is_acceptable'] ) && ! $response['is_acceptable']
-        && current_user_can( 'update_php' )
-    ) {
-        add_filter( 'postbox_classes_dashboard_dashboard_php_nag', 'dashboard_php_nag_class' );
-
-        wp_add_dashboard_widget( 'dashboard_php_nag', __( 'PHP Update Recommended' ), 'wp_dashboard_php_nag' );
+    $check_php = wp_check_php_version();
+
+    if ( $check_php && current_user_can( 'update_php' ) ) {
+        // If "not acceptable" the widget will be shown.
+        if ( isset( $check_php['is_acceptable'] ) && ! $check_php['is_acceptable'] ) {
+            add_filter( 'postbox_classes_dashboard_dashboard_php_nag', 'dashboard_php_nag_class' );
+
+            if ( $check_php['is_lower_than_future_minimum'] ) {
+                wp_add_dashboard_widget( 'dashboard_php_nag', __( 'PHP Update Required' ), 'wp_dashboard_php_nag' );
+            } else {
+                wp_add_dashboard_widget( 'dashboard_php_nag', __( 'PHP Update Recommended' ), 'wp_dashboard_php_nag' );
+            }
+        }
     }
 
@@ -1826 +1832 @@
 
     if ( isset( $response['is_secure'] ) && ! $response['is_secure'] ) {
-        $msg = sprintf(
+        // The `is_secure` array key name doesn't actually imply this is a secure version of PHP. It only means it receives security updates.
+
+        if ( $response['is_lower_than_future_minimum'] ) {
+            $message = sprintf(
+                /* translators: %s: The server PHP version. */
+                __( 'Your site is running on an outdated version of PHP (%s), which does not receive security updates and soon will not be supported by WordPress. Ensure that PHP is updated on your server as soon as possible. Otherwise you will not be able to upgrade WordPress.' ),
+                PHP_VERSION
+            );
+        } else {
+            $message = sprintf(
+                /* translators: %s: The server PHP version. */
+                __( 'Your site is running on an outdated version of PHP (%s), which does not receive security updates. It should be updated.' ),
+                PHP_VERSION
+            );
+        }
+    } elseif ( $response['is_lower_than_future_minimum'] ) {
+        $message = sprintf(
             /* translators: %s: The server PHP version. */
-            __( 'Your site is running an insecure version of PHP (%s), which should be updated.' ),
+            __( 'Your site is running on an outdated version of PHP (%s), which soon will not be supported by WordPress. Ensure that PHP is updated on your server as soon as possible. Otherwise you will not be able to upgrade WordPress.' ),
             PHP_VERSION
         );
     } else {
-        $msg = sprintf(
+        $message = sprintf(
             /* translators: %s: The server PHP version. */
-            __( 'Your site is running an outdated version of PHP (%s), which should be updated.' ),
+            __( 'Your site is running on an outdated version of PHP (%s), which should be updated.' ),
             PHP_VERSION
         );
     }
     ?>
-    <p><?php echo $msg; ?></p>
-
-    <h3><?php _e( 'What is PHP and how does it affect my site?' ); ?></h3>
+    <p class="bigger-bolder-text"><?php echo $message; ?></p>
+
+    <p><?php _e( 'What is PHP and how does it affect my site?' ); ?></p>
     <p>
+        <?php _e( 'PHP is one of the programming languages used to build WordPress. Newer versions of PHP receive regular security updates and may increase your site&#8217;s performance.' ); ?>
         <?php
-        printf(
-            /* translators: %s: The minimum recommended PHP version. */
-            __( 'PHP is the programming language used to build and maintain WordPress. Newer versions of PHP are created with increased performance in mind, so you may see a positive effect on your site&#8217;s performance. The minimum recommended version of PHP is %s.' ),
-            $response ? $response['recommended_version'] : ''
-        );
+        if ( ! empty( $response['recommended_version'] ) ) {
+            printf(
+                /* translators: %s: The minimum recommended PHP version. */
+                __( 'The minimum recommended version of PHP is %s.' ),
+                $response['recommended_version']
+            );
+        }
         ?>
     </p>
@@ -1880 +1905 @@
     $response = wp_check_php_version();
 
-    if ( $response && isset( $response['is_secure'] ) && ! $response['is_secure'] ) {
-        $classes[] = 'php-insecure';
+    if ( ! $response ) {
+        return $classes;
+    }
+
+    if ( isset( $response['is_secure'] ) && ! $response['is_secure'] ) {
+        $classes[] = 'php-no-security-updates';
+    } elseif ( $response['is_lower_than_future_minimum'] ) {
+        $classes[] = 'php-version-lower-than-future-minimum';
     }
 

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

@@ -1586 +1586 @@
          *  'is_supported' - boolean - Whether the PHP version is actively supported.
          *  'is_secure' - boolean - Whether the PHP version receives security updates.
-         *  'is_acceptable' - boolean - Whether the PHP version is still acceptable for WordPress.
+         *  'is_acceptable' - boolean - Whether the PHP version is still acceptable or warnings
+         *                              should be shown and an update recommended.
          */
         $response = json_decode( wp_remote_retrieve_body( $response ), true );
@@ -1614 +1615 @@
     }
 
+    $response['is_lower_than_future_minimum'] = false;
+
+    // The minimum supported PHP version will be updated to 7.2. Check if the current version is lower.
+    if ( version_compare( $version, '7.2', '<' ) ) {
+        $response['is_lower_than_future_minimum'] = true;
+
+        // Force showing of warnings.
+        $response['is_acceptable'] = false;
+    }
+
     return $response;
 }