Changeset 45611 for trunk/src/wp-includes/functions.php

Timestamp:

07/09/2019 05:44:42 AM (7 years ago)

Author:

pento

Message:

Coding Standards: Fix instances of WordPress.PHP.NoSilencedErrors.Discouraged.

Noteable changes:

• The magic_quotes_runtime and magic_quotes_sybase settings were removed in PHP 5.4, so no longer need to be set.
• Some functions that use external libraries can generate errors that can't be tested for, so are globally allowed to silence errors.
• Quite a few functions would cause errors if safe_mode was set. This setting was removed in PHP 5.4.
• Only a handful of header() calls needed corresponding headers_sent() checks for unit tests to pass, but more may need to be added as the nightlies builds are tested.

See #46732.

File:

• trunk/src/wp-includes/functions.php (modified) (18 diffs)

trunk/src/wp-includes/functions.php

@@ -98 +98 @@
         $i = $timestamp_with_offset;
 
-        if ( false === $i ) {
+        if ( ! is_numeric( $i ) ) {
                 $i = current_time( 'timestamp', $gmt );
         }
@@ -178 +178 @@
                 }
         }
-        $j = @gmdate( $dateformatstring, $i );
+        $j = gmdate( $dateformatstring, $i );
 
         /**
@@ -225 +225 @@
 
                 // Match a format like 'j F Y' or 'j. F'
-                if ( @preg_match( '#^\d{1,2}\.? [^\d ]+#u', $date ) ) {
+                if ( preg_match( '#^\d{1,2}\.? [^\d ]+#u', $date ) ) {
 
                         foreach ( $months as $key => $month ) {
@@ -239 +239 @@
 
                 // Match a format like 'F jS' or 'F j' and change it to 'j F'
-                if ( @preg_match( '#^[^\d ]+ \d{1,2}(st|nd|rd|th)? #u', trim( $date ) ) ) {
+                if ( preg_match( '#^[^\d ]+ \d{1,2}(st|nd|rd|th)? #u', trim( $date ) ) ) {
                         foreach ( $months as $key => $month ) {
                                 $months[ $key ] = '#' . $month . ' (\d{1,2})(st|nd|rd|th)?#u';
@@ -1259 +1259 @@
         }
 
-        @header( $status_header, true, $code );
+        if ( ! headers_sent() ) {
+                header( $status_header, true, $code );
+        }
 }
 
@@ -1311 +1313 @@
  */
 function nocache_headers() {
+        if ( headers_sent() ) {
+                return;
+        }
+
         $headers = wp_get_nocache_headers();
 
         unset( $headers['Last-Modified'] );
 
-        // In PHP 5.3+, make sure we are not sending a Last-Modified header.
-        if ( function_exists( 'header_remove' ) ) {
-                @header_remove( 'Last-Modified' );
-        } else {
-                // In PHP 5.2, send an empty Last-Modified header, but only as a
-                // last resort to override a header already sent. #WP23021
-                foreach ( headers_list() as $header ) {
-                        if ( 0 === stripos( $header, 'Last-Modified' ) ) {
-                                $headers['Last-Modified'] = '';
-                                break;
-                        }
-                }
-        }
+        header_remove( 'Last-Modified' );
 
         foreach ( $headers as $name => $field_value ) {
-                @header( "{$name}: {$field_value}" );
+                header( "{$name}: {$field_value}" );
         }
 }
@@ -1830 +1824 @@
                         $folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
                         for ( $i = 1, $c = count( $folder_parts ); $i <= $c; $i++ ) {
-                                @chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
+                                chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
                         }
                 }
@@ -2422 +2416 @@
         }
 
-        $ifp = @ fopen( $new_file, 'wb' );
+        $ifp = @fopen( $new_file, 'wb' );
         if ( ! $ifp ) {
                 return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
         }
 
-        @fwrite( $ifp, $bits );
+        fwrite( $ifp, $bits );
         fclose( $ifp );
         clearstatcache();
@@ -2435 +2429 @@
         $perms = $stat['mode'] & 0007777;
         $perms = $perms & 0000666;
-        @ chmod( $new_file, $perms );
+        chmod( $new_file, $perms );
         clearstatcache();
 
@@ -2708 +2702 @@
                         $mime      = ( $imagetype ) ? image_type_to_mime_type( $imagetype ) : false;
                 } elseif ( function_exists( 'getimagesize' ) ) {
-                        $imagesize = getimagesize( $file );
+                        $imagesize = @getimagesize( $file );
                         $mime      = ( isset( $imagesize['mime'] ) ) ? $imagesize['mime'] : false;
                 } else {
@@ -3602 +3596 @@
         $args[0] = _wp_json_prepare_data( $data );
 
+        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- json_encode() errors are handled after this call
         $json = @call_user_func_array( 'json_encode', $args );
 
@@ -3776 +3771 @@
  */
 function wp_send_json( $response, $status_code = null ) {
-        @header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
-        if ( null !== $status_code ) {
-                status_header( $status_code );
-        }
+        if ( ! headers_sent() ) {
+                header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
+                if ( null !== $status_code ) {
+                        status_header( $status_code );
+                }
+        }
+
         echo wp_json_encode( $response );
 
@@ -5727 +5725 @@
  */
 function send_nosniff_header() {
-        @header( 'X-Content-Type-Options: nosniff' );
+        header( 'X-Content-Type-Options: nosniff' );
 }
 
@@ -5841 +5839 @@
  */
 function send_frame_options_header() {
-        @header( 'X-Frame-Options: SAMEORIGIN' );
+        header( 'X-Frame-Options: SAMEORIGIN' );
 }
 
@@ -6415 +6413 @@
         }
 
-        $current_limit     = @ini_get( 'memory_limit' );
+        $current_limit     = ini_get( 'memory_limit' );
         $current_limit_int = wp_convert_hr_to_bytes( $current_limit );
 
@@ -6487 +6485 @@
 
         if ( -1 === $filtered_limit_int || ( $filtered_limit_int > $wp_max_limit_int && $filtered_limit_int > $current_limit_int ) ) {
-                if ( false !== @ini_set( 'memory_limit', $filtered_limit ) ) {
+                if ( false !== ini_set( 'memory_limit', $filtered_limit ) ) {
                         return $filtered_limit;
                 } else {
@@ -6493 +6491 @@
                 }
         } elseif ( -1 === $wp_max_limit_int || $wp_max_limit_int > $current_limit_int ) {
-                if ( false !== @ini_set( 'memory_limit', $wp_max_limit ) ) {
+                if ( false !== ini_set( 'memory_limit', $wp_max_limit ) ) {
                         return $wp_max_limit;
                 } else {
@@ -7180 +7178 @@
 
 /**
-* 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.
-*/
+ * 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, '>=' );