fix merge conflits

Author: rrennick

composer.json

@@ -37,7 +37,8 @@
     "classmap": [
       "src/Controllers/Version1",
       "src/Controllers/Version2",
-      "src/Controllers/Version3"
+      "src/Controllers/Version3",
+      "src/Controllers/Version4"
     ],
     "psr-4": {
       "Automattic\\WooCommerce\\RestApi\\": "src"

src/Controllers/Version2/class-wc-rest-system-status-tools-v2-controller.php

@@ -209,6 +209,15 @@ public function get_tools() {
 				),
 			),
 		);
+		if ( method_exists( 'WC_Install', 'verify_base_tables' ) ) {
+			$tools['verify_db_tables'] = array(
+				'name'   => __( 'Verify base database tables', 'woocommerce-rest-api' ),
+				'button' => __( 'Verify database', 'woocommerce-rest-api' ),
+				'desc'   => sprintf(
+					__( 'Verify if all base database tables are present.', 'woocommerce-rest-api' )
+				),
+			);
+		}
 
 		// Jetpack does the image resizing heavy lifting so you don't have to.
 		if ( ( class_exists( 'Jetpack' ) && Jetpack::is_module_active( 'photon' ) ) || ! apply_filters( 'woocommerce_background_image_regeneration', true ) ) {
@@ -472,7 +481,7 @@ public function execute_tool( $tool ) {
 						$wpdb->prepare(
 							"DELETE FROM {$wpdb->prefix}woocommerce_downloadable_product_permissions
 							WHERE ( downloads_remaining != '' AND downloads_remaining = 0 ) OR ( access_expires IS NOT NULL AND access_expires < %s )",
-							date( 'Y-m-d', current_time( 'timestamp' ) )
+							gmdate( 'Y-m-d', current_time( 'timestamp' ) )
 						)
 					)
 				);
@@ -557,6 +566,20 @@ public function execute_tool( $tool ) {
 					$message = __( 'Template cache cleared.', 'woocommerce-rest-api' );
 				} else {
 					$message = __( 'The active version of WooCommerce does not support template cache clearing.', 'woocommerce-rest-api' );
+			case 'verify_db_tables':
+				if ( ! method_exists( 'WC_Install', 'verify_base_tables' ) ) {
+					$message = __( 'You need WooCommerce 4.2 or newer to run this tool.', 'woocommerce-rest-api' );
+					$ran = false;
+					break;
+				}
+				// Try to manually create table again.
+				$missing_tables = WC_Install::verify_base_tables( true, true );
+				if ( 0 === count( $missing_tables ) ) {
+					$message = __( 'Database verified successfully.', 'woocommerce-rest-api' );
+				} else {
+					$message = __( 'Verifying database... One or more tables are still missing: ', 'woocommerce-rest-api' );
+					$message .= implode( ', ', $missing_tables );
+					$ran = false;
 				}
 				break;