Ticket #46937: 46937-wpcs.diff

wp-admin/includes/update-core.php

@@ -254 +254 @@
         'wp-includes/js/jquery/interface.js',
         'wp-includes/js/scriptaculous/prototype.js',
         // Following file added back in 5.1 see #45645
-        //'wp-includes/js/tinymce/wp-tinymce.js',
+        // 'wp-includes/js/tinymce/wp-tinymce.js',
         // 3.1
         'wp-admin/edit-attachment-rows.php',
         'wp-admin/edit-link-categories.php',
@@ -928 +928 @@
         }
 
         $wp_filesystem->chmod( $versions_file, FS_CHMOD_FILE );
-        require( WP_CONTENT_DIR . '/upgrade/version-current.php' );
+        require WP_CONTENT_DIR . '/upgrade/version-current.php';
         $wp_filesystem->delete( $versions_file );
 
         $php_version       = phpversion();
@@ -946 +946 @@
                 $wp_filesystem->delete( $from, true );
         }
 
+        /* translators: %s: Update PHP page URL */
+        $php_update_message = '<br>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
+
+        $annotation = wp_get_update_php_annotation();
+
+        if ( $annotation ) {
+                $php_update_message .= '<br><em>' . $annotation . '</em>';
+        }
+
         if ( ! $mysql_compat && ! $php_compat ) {
-                return new WP_Error( 'php_mysql_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) );
+                return new WP_Error( 'php_mysql_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) . $php_update_message );
         } elseif ( ! $php_compat ) {
-                return new WP_Error( 'php_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version ) );
+                return new WP_Error( 'php_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version ) . $php_update_message );
         } elseif ( ! $mysql_compat ) {
                 return new WP_Error( 'mysql_not_compatible', sprintf( __( 'The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version ) );
         }
@@ -1165 +1174 @@
                                         // If a error occurs partway through this final step, keep the error flowing through, but keep process going.
                                         if ( is_wp_error( $_result ) ) {
                                                 if ( ! is_wp_error( $result ) ) {
-                                                        $result = new WP_Error;
+                                                        $result = new WP_Error();
                                                 }
                                                 $result->add( $_result->get_error_code() . "_$type", $_result->get_error_message(), substr( $_result->get_error_data(), strlen( $dest ) ) );
                                         }
@@ -1253 +1262 @@
  *
  * @param string $from     source directory
  * @param string $to       destination directory
- * @param array $skip_list a list of files/folders to skip copying
+ * @param array  $skip_list a list of files/folders to skip copying
  * @return mixed WP_Error on failure, True on success.
  */
 function _copy_dir( $from, $to, $skip_list = array() ) {
@@ -1350 +1359 @@
         <?php
 
         // Include admin-footer.php and exit.
-        include( ABSPATH . 'wp-admin/admin-footer.php' );
+        include ABSPATH . 'wp-admin/admin-footer.php';
         exit();
 }
 

wp-admin/install.php

@@ -33 +33 @@
 define( 'WP_INSTALLING', true );
 
 /** Load WordPress Bootstrap */
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require_once dirname( dirname( __FILE__ ) ) . '/wp-load.php';
 
 /** Load WordPress Administration Upgrade API */
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
 /** Load WordPress Translation Install API */
-require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+require_once ABSPATH . 'wp-admin/includes/translation-install.php';
 
 /** Load wpdb */
-require_once( ABSPATH . WPINC . '/wp-db.php' );
+require_once ABSPATH . WPINC . '/wp-db.php';
 
 nocache_headers();
 
@@ -243 +243 @@
         sanitize_title( $wp_version )
 );
 
+/* translators: %s: Update PHP page URL */
+$php_update_message = '<br>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
+
+$annotation = wp_get_update_php_annotation();
+
+if ( $annotation ) {
+        $php_update_message .= '<br><em>' . $annotation . '</em>';
+}
+
 if ( ! $mysql_compat && ! $php_compat ) {
         /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
-        $compat = sprintf( __( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
+        $compat = sprintf( __( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) . $php_update_message;
 } elseif ( ! $php_compat ) {
         /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
-        $compat = sprintf( __( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_php_version, $php_version );
+        $compat = sprintf( __( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_php_version, $php_version ) . $php_update_message;
 } elseif ( ! $mysql_compat ) {
         /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
         $compat = sprintf( __( 'You cannot install because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_mysql_version, $mysql_version );

wp-admin/update-core.php

@@ -7 +7 @@
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once dirname( __FILE__ ) . '/admin.php';
 
 wp_enqueue_style( 'plugin-install' );
 wp_enqueue_script( 'plugin-install' );
@@ -76 +76 @@
                                 sanitize_title( $update->current )
                         );
 
+                        /* translators: %s: Update PHP page URL */
+                        $php_update_message = '<br>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
+
+                        $annotation = wp_get_update_php_annotation();
+
+                        if ( $annotation ) {
+                                $php_update_message .= '<br><em>' . $annotation . '</em>';
+                        }
+
                         if ( ! $mysql_compat && ! $php_compat ) {
                                 /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
-                                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
+                                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version ) . $php_update_message;
                         } elseif ( ! $php_compat ) {
                                 /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
-                                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->php_version, $php_version );
+                                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->php_version, $php_version ) . $php_update_message;
                         } elseif ( ! $mysql_compat ) {
                                 /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
                                 $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $update->current, $update->mysql_version, $mysql_version );
@@ -183 +192 @@
 
                 if ( wp_http_supports( array( 'ssl' ) ) ) {
                         require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-                        $upgrader            = new WP_Automatic_Updater;
+                        $upgrader            = new WP_Automatic_Updater();
                         $future_minor_update = (object) array(
                                 'current'       => $wp_version . '.1.next.minor',
                                 'version'       => $wp_version . '.1.next.minor',
@@ -208 +217 @@
 
         if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) {
                 require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
-                $upgrader = new WP_Automatic_Updater;
+                $upgrader = new WP_Automatic_Updater();
                 if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) {
                         echo '<div class="updated inline"><p>';
                         echo '<strong>' . __( 'BETA TESTERS:' ) . '</strong> ' . __( 'This site is set up to install updates of future beta versions automatically.' );
@@ -237 +246 @@
         $wp_version     = get_bloginfo( 'version' );
         $cur_wp_version = preg_replace( '/-.*$/', '', $wp_version );
 
-        require_once( ABSPATH . 'wp-admin/includes/plugin-install.php' );
+        require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
         $plugins = get_plugin_updates();
         if ( empty( $plugins ) ) {
                 echo '<h2>' . __( 'Plugins' ) . '</h2>';
@@ -497 +506 @@
 function do_core_upgrade( $reinstall = false ) {
         global $wp_filesystem;
 
-        include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+        include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
         if ( $reinstall ) {
                 $url = 'update-core.php?action=do-core-reinstall';
@@ -655 +664 @@
         $force_check = ! empty( $_GET['force-check'] );
         wp_version_check( array(), $force_check );
 
-        require_once( ABSPATH . 'wp-admin/admin-header.php' );
+        require_once ABSPATH . 'wp-admin/admin-header.php';
         ?>
         <div class="wrap">
         <h1><?php _e( 'WordPress Updates' ); ?></h1>
@@ -712 +721 @@
                 )
         );
 
-        include( ABSPATH . 'wp-admin/admin-footer.php' );
+        include ABSPATH . 'wp-admin/admin-footer.php';
 
 } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
 
@@ -729 +738 @@
                 do_undismiss_core_update();
         }
 
-        require_once( ABSPATH . 'wp-admin/admin-header.php' );
+        require_once ABSPATH . 'wp-admin/admin-header.php';
         if ( 'do-core-reinstall' == $action ) {
                 $reinstall = true;
         } else {
@@ -748 +757 @@
                 )
         );
 
-        include( ABSPATH . 'wp-admin/admin-footer.php' );
+        include ABSPATH . 'wp-admin/admin-footer.php';
 
 } elseif ( 'do-plugin-upgrade' == $action ) {
 
@@ -772 +781 @@
 
         $title = __( 'Update Plugins' );
 
-        require_once( ABSPATH . 'wp-admin/admin-header.php' );
+        require_once ABSPATH . 'wp-admin/admin-header.php';
         echo '<div class="wrap">';
         echo '<h1>' . __( 'Update Plugins' ) . '</h1>';
         echo '<iframe src="', $url, '" style="width: 100%; height: 100%; min-height: 750px;" frameborder="0" title="' . esc_attr__( 'Update progress' ) . '"></iframe>';
@@ -786 +795 @@
                 )
         );
 
-        include( ABSPATH . 'wp-admin/admin-footer.php' );
+        include ABSPATH . 'wp-admin/admin-footer.php';
 
 } elseif ( 'do-theme-upgrade' == $action ) {
 
@@ -810 +819 @@
 
         $title = __( 'Update Themes' );
 
-        require_once( ABSPATH . 'wp-admin/admin-header.php' );
+        require_once ABSPATH . 'wp-admin/admin-header.php';
         ?>
         <div class="wrap">
                 <h1><?php _e( 'Update Themes' ); ?></h1>
@@ -826 +835 @@
                 )
         );
 
-        include( ABSPATH . 'wp-admin/admin-footer.php' );
+        include ABSPATH . 'wp-admin/admin-footer.php';
 
 } elseif ( 'do-translation-upgrade' == $action ) {
 
@@ -836 +845 @@
 
         check_admin_referer( 'upgrade-translations' );
 
-        require_once( ABSPATH . 'wp-admin/admin-header.php' );
-        include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+        require_once ABSPATH . 'wp-admin/admin-header.php';
+        include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
         $url     = 'update-core.php?action=do-translation-upgrade';
         $nonce   = 'upgrade-translations';
@@ -855 +864 @@
                 )
         );
 
-        require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+        require_once ABSPATH . 'wp-admin/admin-footer.php';
 
 } else {
         /**

wp-admin/upgrade.php

@@ -15 +15 @@
 define( 'WP_INSTALLING', true );
 
 /** Load WordPress Bootstrap */
-require( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+require dirname( dirname( __FILE__ ) ) . '/wp-load.php';
 
 nocache_headers();
 
 timer_start();
-require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+require_once ABSPATH . 'wp-admin/includes/upgrade.php';
 
 delete_site_transient( 'update_core' );
 
@@ -54 +54 @@
         $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
 }
 
+/* translators: %s: Update PHP page URL */
+$php_update_message = '<br>' . sprintf( __( '<a href="%s">Learn more about updating PHP</a>.' ), esc_url( wp_get_update_php_url() ) );
+
+$annotation = wp_get_update_php_annotation();
+
+if ( $annotation ) {
+        $php_update_message .= '<br><em>' . $annotation . '</em>';
+}
+
 @header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
 ?>
 <!DOCTYPE html>
@@ -87 +96 @@
 
         if ( ! $mysql_compat && ! $php_compat ) {
                 /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Minimum required MySQL version number, 5: Current PHP version number, 6: Current MySQL version number */
-                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
+                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher and MySQL version %4$s or higher. You are running PHP version %5$s and MySQL version %6$s.' ), $version_url, $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) . $php_update_message;
         } elseif ( ! $php_compat ) {
                 /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required PHP version number, 4: Current PHP version number */
-                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_php_version, $php_version );
+                $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires PHP version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_php_version, $php_version ) . $php_update_message;
         } elseif ( ! $mysql_compat ) {
                 /* translators: 1: URL to WordPress release notes, 2: WordPress version number, 3: Minimum required MySQL version number, 4: Current MySQL version number */
                 $message = sprintf( __( 'You cannot update because <a href="%1$s">WordPress %2$s</a> requires MySQL version %3$s or higher. You are running version %4$s.' ), $version_url, $wp_version, $required_mysql_version, $mysql_version );