Changeset 47557 for trunk/src/wp-includes/post.php

Timestamp:

04/09/2020 03:41:04 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use strict type check for in_array() and array_search().

This addresses all the remaining WordPress.PHP.StrictInArray.MissingTrueStrict issues in core.

Includes minor code layout fixes for better readability.

Follow-up to [47550].

See #49542.

File:

• trunk/src/wp-includes/post.php (modified) (14 diffs)

trunk/src/wp-includes/post.php

@@ -2285 +2285 @@
     $stickies = get_option( 'sticky_posts' );
 
-    $is_sticky = is_array( $stickies ) && in_array( $post_id, $stickies );
+    if ( is_array( $stickies ) ) {
+        $stickies  = array_map( 'intval', $stickies );
+        $is_sticky = in_array( $post_id, $stickies, true );
+    } else {
+        $is_sticky = false;
+    }
 
     /**
@@ -2512 +2517 @@
  */
 function stick_post( $post_id ) {
+    $post_id  = (int) $post_id;
     $stickies = get_option( 'sticky_posts' );
 
     if ( ! is_array( $stickies ) ) {
-        $stickies = array( $post_id );
-    }
-
-    if ( ! in_array( $post_id, $stickies ) ) {
+        $stickies = array();
+    }
+
+    $stickies = array_map( 'intval', $stickies );
+
+    if ( ! in_array( $post_id, $stickies, true ) ) {
         $stickies[] = $post_id;
     }
@@ -2546 +2554 @@
  */
 function unstick_post( $post_id ) {
+    $post_id  = (int) $post_id;
     $stickies = get_option( 'sticky_posts' );
 
@@ -2552 +2561 @@
     }
 
-    if ( ! in_array( $post_id, $stickies ) ) {
+    $stickies = array_map( 'intval', $stickies );
+
+    if ( ! in_array( $post_id, $stickies, true ) ) {
         return;
     }
 
-    $offset = array_search( $post_id, $stickies );
+    $offset = array_search( $post_id, $stickies, true );
     if ( false === $offset ) {
         return;
@@ -2842 +2853 @@
         $mimes = array_map( 'trim', explode( ',', $type ) );
         foreach ( $mimes as $mime ) {
-            $regex                 = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $mime ) ) );
+            $regex = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $mime ) ) );
+
             $patternses[][ $type ] = "^$regex$";
+
             if ( false === strpos( $mime, '/' ) ) {
                 $patternses[][ $type ] = "^$regex/";
@@ -2855 +2868 @@
         foreach ( $patterns as $type => $pattern ) {
             foreach ( (array) $real_mime_types as $real ) {
-                if ( preg_match( "#$pattern#", $real ) && ( empty( $matches[ $type ] ) || false === array_search( $real, $matches[ $type ] ) ) ) {
+                if ( preg_match( "#$pattern#", $real )
+                    && ( empty( $matches[ $type ] ) || false === array_search( $real, $matches[ $type ], true ) )
+                ) {
                     $matches[ $type ][] = $real;
                 }
@@ -2861 +2876 @@
         }
     }
+
     return $matches;
 }
@@ -2915 +2931 @@
         }
     }
+
     if ( ! empty( $wheres ) ) {
         $where = ' AND (' . join( ' OR ', $wheres ) . ') ';
     }
+
     return $where;
 }
@@ -4437 +4455 @@
         $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
 
+        $post = get_post( $post_ID );
+
         // Prevent new post slugs that could result in URLs that conflict with date archives.
-        $post                        = get_post( $post_ID );
         $conflicts_with_date_archive = false;
         if ( 'post' === $post_type && ( ! $post || $post->post_name !== $slug ) && preg_match( '/^[0-9]+$/', $slug ) ) {
@@ -4445 +4464 @@
             if ( $slug_num ) {
                 $permastructs   = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
-                $postname_index = array_search( '%postname%', $permastructs );
+                $postname_index = array_search( '%postname%', $permastructs, true );
 
                 /*
@@ -5501 +5520 @@
         $num_pages = count( $pages );
         for ( $i = 0; $i < $num_pages; $i++ ) {
-            if ( in_array( $pages[ $i ]->ID, $exclude ) ) {
+            if ( in_array( $pages[ $i ]->ID, $exclude, true ) ) {
                 unset( $pages[ $i ] );
             }
@@ -5812 +5831 @@
 function wp_get_attachment_metadata( $attachment_id = 0, $unfiltered = false ) {
     $attachment_id = (int) $attachment_id;
-    $post          = get_post( $attachment_id );
+
+    $post = get_post( $attachment_id );
     if ( ! $post ) {
         return false;
@@ -5846 +5866 @@
 function wp_update_attachment_metadata( $attachment_id, $data ) {
     $attachment_id = (int) $attachment_id;
-    $post          = get_post( $attachment_id );
+
+    $post = get_post( $attachment_id );
     if ( ! $post ) {
         return false;
@@ -5879 +5900 @@
 function wp_get_attachment_url( $attachment_id = 0 ) {
     $attachment_id = (int) $attachment_id;
-    $post          = get_post( $attachment_id );
+
+    $post = get_post( $attachment_id );
     if ( ! $post ) {
         return false;