refactor(v3.5) apply updates from master

lucatume · Mar 7, 2024 · d99d7dd · d99d7dd
1 parent f33bbbe
commit d99d7dd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/bin/setup-wp.php b/bin/setup-wp.php
@@ -56,7 +56,7 @@
     $extraPHP = <<< PHP
 define( 'WP_DEBUG_LOG', true );
 define( 'WP_DEBUG_DISPLAY', false );
-define( 'DISABLE_CRON', true );
+define( 'DISABLE_WP_CRON', true );
 PHP;
     $configData->setExtraPHP($extraPHP);
     $installation = $installation->configure(

diff --git a/includes/cli-server/router.php b/includes/cli-server/router.php
@@ -9,6 +9,18 @@
 
 define('DB_ENGINE', getenv('DB_ENGINE') ?: 'mysql');
 
+// Add a unique request ID to the headers.
+$requestId             = md5( microtime() );
+$_SERVER['REQUEST_ID'] = $requestId;
+header( 'X-Request-ID: ' . $requestId );
+
+// Disable the MU upgrade routine.
+global $wp_filter;
+$wp_filter['do_mu_upgrade'][10][] = [
+    'accepted_args' => 0,
+    'function'      => '__return_false'
+];
+
 if ( file_exists( $root.$path ) ) {
 
 	// Enforces trailing slash, keeping links tidy in the admin

diff --git a/src/WordPress/Database/MysqlDatabase.php b/src/WordPress/Database/MysqlDatabase.php
@@ -383,6 +383,9 @@ public function start($filename = ''): void
         };
     }
 
+    /**
+     * @throws Exception
+     */
     private function buildDruidfiMysqldump(): Mysqldump
     {
         $dumpSettings = [ 'add-drop-table' => true, 'add-drop-database' => true ];

diff --git a/tests/webdriver.suite.dist.yml b/tests/webdriver.suite.dist.yml
@@ -17,6 +17,7 @@ modules:
       path: '/'
       window_size: false
       wait: 5
+      pageload_timeout: 5
       capabilities:
         "goog:chromeOptions":
           args: