Changeset 50613 for trunk/src/wp-admin/includes/privacy-tools.php

Timestamp:

03/29/2021 07:35:36 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Check if the _export_data_grouped post meta is an array when generating a personal data export file.

This avoids a fatal error on PHP 8 in wp_privacy_generate_personal_data_export_file() if the _export_data_grouped post meta exists but is not an array.

Additionally, refactor unit tests for the function to:

• Reduce redundant code
• Switch to data provider
• Test on the full HTML output instead of select pieces of the output
• Expand unhappy path coverage

Follow-up to [43012], [44786], [47146], [47278].

Props hellofromTonya, jrf, xknown.
See #51423.

File:

• trunk/src/wp-admin/includes/privacy-tools.php (modified) (2 diffs)

trunk/src/wp-admin/includes/privacy-tools.php

@@ -362 +362 @@
         $email_address
     );
-
-    // And now, all the Groups.
-    $groups = get_post_meta( $request_id, '_export_data_grouped', true );
 
     // First, build an "About" group on the fly for this report.
@@ -394 +391 @@
     );
 
-    // Merge in the special about group.
-    $groups = array_merge( array( 'about' => $about_group ), $groups );
-
-    $groups_count = count( $groups );
+    // And now, all the Groups.
+    $groups = get_post_meta( $request_id, '_export_data_grouped', true );
+    if ( is_array( $groups ) ) {
+        // Merge in the special "About" group.
+        $groups       = array_merge( array( 'about' => $about_group ), $groups );
+        $groups_count = count( $groups );
+    } else {
+        if ( false !== $groups ) {
+            _doing_it_wrong(
+                __FUNCTION__,
+                /* translators: %s: Post meta key. */
+                sprintf( __( 'The %s post meta must be an array.' ), '<code>_export_data_grouped</code>' ),
+                '5.8.0'
+            );
+        }
+
+        $groups       = null;
+        $groups_count = 0;
+    }
 
     // Convert the groups to JSON format.