Changeset 43819

Timestamp:

10/24/2018 04:32:29 PM (6 years ago)

Author:

jorbin

Message:

php7.3 compatibility: Fix compact throwing notices

In PHP 7.3, the compact() function has been changed to issue an E_NOTICE level error if a passed string refers to an unset variable. In previous versions of PHP, this notice was silently skipped. The full RFC can be viewed here: ​https://wiki.php.net/rfc/compact

This fixes all unit tested code that uses compact.

Props desrosj.
Fixes #44416.

Location:

branches/5.0

Files:

• src/wp-includes/class-wp-comment-query.php (modified) (2 diffs)
• src/wp-includes/class-wp-xmlrpc-server.php (modified) (5 diffs)
• src/wp-includes/comment.php (modified) (1 diff)
• src/wp-includes/post.php (modified) (2 diffs)
• tests/phpunit/tests/dependencies/scripts.php (modified) (1 diff)

branches/5.0/src/wp-includes/class-wp-comment-query.php

@@ -634 +634 @@
         $offset = absint( $this->query_vars['offset'] );
         $paged = absint( $this->query_vars['paged'] );
+        $limits = '';
 
         if ( ! empty( $number ) ) {
@@ -818 +819 @@
         }
 
-        $join = '';
+        $join    = '';
+        $groupby = '';
 
         if ( $join_posts_table ) {

branches/5.0/src/wp-includes/class-wp-xmlrpc-server.php

@@ -3518 +3518 @@
         /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
         do_action( 'xmlrpc_call', 'wp.editComment' );
+        $comment = array(
+            'comment_ID' => $comment_ID,
+        );
+
 
         if ( isset($content_struct['status']) ) {
@@ -3525 +3529 @@
             if ( ! in_array($content_struct['status'], $statuses) )
                 return new IXR_Error( 401, __( 'Invalid comment status.' ) );
-            $comment_approved = $content_struct['status'];
+            $comment['comment_approved'] = $content_struct['status'];
         }
 
@@ -3531 +3535 @@
         if ( !empty( $content_struct['date_created_gmt'] ) ) {
             // We know this is supposed to be GMT, so we're going to slap that Z on there by force
-            $dateCreated = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
-            $comment_date = get_date_from_gmt(iso8601_to_datetime($dateCreated));
-            $comment_date_gmt = iso8601_to_datetime($dateCreated, 'GMT');
-        }
-
-        if ( isset($content_struct['content']) )
-            $comment_content = $content_struct['content'];
-
-        if ( isset($content_struct['author']) )
-            $comment_author = $content_struct['author'];
-
-        if ( isset($content_struct['author_url']) )
-            $comment_author_url = $content_struct['author_url'];
-
-        if ( isset($content_struct['author_email']) )
-            $comment_author_email = $content_struct['author_email'];
-
-        // We've got all the data -- post it:
-        $comment = compact('comment_ID', 'comment_content', 'comment_approved', 'comment_date', 'comment_date_gmt', 'comment_author', 'comment_author_email', 'comment_author_url');
+
+            $dateCreated                 = rtrim( $content_struct['date_created_gmt']->getIso(), 'Z' ) . 'Z';
+            $comment['comment_date']     = get_date_from_gmt( iso8601_to_datetime( $dateCreated ) );
+            $comment['comment_date_gmt'] = iso8601_to_datetime( $dateCreated, 'GMT' );
+        }
+
+        if ( isset($content_struct['content']) ) {
+            $comment['comment_content'] = $content_struct['content'];
+        }
+
+        if ( isset($content_struct['author']) ) {
+            $comment['comment_author'] = $content_struct['author'];
+        }
+
+        if ( isset($content_struct['author_url']) ) {
+            $comment['comment_author_url'] = $content_struct['author_url'];
+        }
+
+        if ( isset($content_struct['author_email']) ) {
+            $comment['comment_author_email'] = $content_struct['author_email'];
+        }
 
         $result = wp_update_comment($comment);
@@ -4990 +4996 @@
 
         // Only use a password if one was given.
-        if ( isset($content_struct['wp_password']) )
+        if ( isset($content_struct['wp_password']) ) {
             $post_password = $content_struct['wp_password'];
+        } else {
+            $post_password = '';
+        }
 
         // Only set a post parent if one was provided.
-        if ( isset($content_struct['wp_page_parent_id']) )
+        if ( isset($content_struct['wp_page_parent_id']) ) {
             $post_parent = $content_struct['wp_page_parent_id'];
+        } else {
+            $post_parent = 0;
+        }
 
         // Only set the menu_order if it was provided.
-        if ( isset($content_struct['wp_page_order']) )
+        if ( isset($content_struct['wp_page_order']) ) {
             $menu_order = $content_struct['wp_page_order'];
+        } else {
+            $menu_order = 0;
+        }
 
         $post_author = $user->ID;
@@ -5309 +5324 @@
         $this->escape($postdata);
 
-        $ID = $postdata['ID'];
-        $post_content = $postdata['post_content'];
-        $post_title = $postdata['post_title'];
-        $post_excerpt = $postdata['post_excerpt'];
-        $post_password = $postdata['post_password'];
-        $post_parent = $postdata['post_parent'];
-        $post_type = $postdata['post_type'];
-        $menu_order = $postdata['menu_order'];
+        $ID             = $postdata['ID'];
+        $post_content   = $postdata['post_content'];
+        $post_title     = $postdata['post_title'];
+        $post_excerpt   = $postdata['post_excerpt'];
+        $post_password  = $postdata['post_password'];
+        $post_parent    = $postdata['post_parent'];
+        $post_type      = $postdata['post_type'];
+        $menu_order     = $postdata['menu_order'];
+        $ping_status    = $postdata['ping_status'];
+        $comment_status = $postdata['comment_status'];
 
         // Let WordPress manage slug if none was provided.

branches/5.0/src/wp-includes/comment.php

@@ -2966 +2966 @@
 function wp_handle_comment_submission( $comment_data ) {
 
-    $comment_post_ID = $comment_parent = 0;
+    $comment_post_ID = $comment_parent = $user_ID = 0;
     $comment_author = $comment_author_email = $comment_author_url = $comment_content = null;
 

branches/5.0/src/wp-includes/post.php

@@ -3416 +3416 @@
     }
 
+    $new_postarr = array_merge(
+        array(
+            'ID' => $post_ID,
+        ),
+        compact( array_diff( array_keys( $defaults ), array( 'context', 'filter' ) ) )
+    );
+
     /**
      * Filters the post parent -- used to check for and prevent hierarchy loops.
@@ -3426 +3433 @@
      * @param array $postarr     Array of sanitized, but otherwise unmodified post data.
      */
-    $post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, compact( array_keys( $postarr ) ), $postarr );
+    $post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, $new_postarr, $postarr );
 
     /*

branches/5.0/tests/phpunit/tests/dependencies/scripts.php

@@ -862 +862 @@
      */
     public function test_wp_enqueue_code_editor_when_generated_array_by_compact_will_be_passed() {
+        $file                   = '';
         $wp_enqueue_code_editor = wp_enqueue_code_editor( compact( 'file' ) );
         $this->assertNonEmptyMultidimensionalArray( $wp_enqueue_code_editor );