wp-studio 1.7.10 → 1.7.11

package/dist/cli/wp-files/sqlite-database-integration/wp-includes/sqlite/class-wp-sqlite-db.php

@@ -16,7 +16,7 @@ class WP_SQLite_DB extends wpdb {
 	/**
 	 * Database Handle
 	 *
-	 * @var WP_SQLite_Translator
+	 * @var WP_SQLite_Driver
 	 */
 	protected $dbh;
 
@@ -94,10 +94,6 @@ class WP_SQLite_DB extends wpdb {
 	 * @param array $modes Optional. A list of SQL modes to set. Default empty array.
 	 */
 	public function set_sql_mode( $modes = array() ) {
-		if ( ! $this->dbh instanceof WP_SQLite_Driver ) {
-			return;
-		}
-
 		if ( empty( $modes ) ) {
 			$result = $this->dbh->query( 'SELECT @@SESSION.sql_mode' );
 			if ( ! isset( $result[0] ) ) {
@@ -175,28 +171,6 @@ class WP_SQLite_DB extends wpdb {
 		return $this->add_placeholder_escape( $escaped );
 	}
 
-	/**
-	 * Method to dummy out wpdb::esc_like() function.
-	 *
-	 * WordPress 4.0.0 introduced esc_like() function that adds backslashes to %,
-	 * underscore and backslash, which is not interpreted as escape character
-	 * by SQLite. So we override it and dummy out this function.
-	 *
-	 * @param string $text The raw text to be escaped. The input typed by the user should have no
-	 *                     extra or deleted slashes.
-	 *
-	 * @return string Text in the form of a LIKE phrase. The output is not SQL safe. Call $wpdb::prepare()
-	 *                or real_escape next.
-	 */
-	public function esc_like( $text ) {
-		// The new driver adds "ESCAPE '\\'" to every LIKE expression by default.
-		// We only need to overload this function to a no-op for the old driver.
-		if ( $this->dbh instanceof WP_SQLite_Driver ) {
-			return parent::esc_like( $text );
-		}
-		return $text;
-	}
-
 	/**
 	 * Prints SQL/DB error.
 	 *
@@ -326,34 +300,28 @@ class WP_SQLite_DB extends wpdb {
 			}
 		}
 
-		if ( defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ) {
-			if ( null === $this->dbname || '' === $this->dbname ) {
-				$this->bail(
-					'The database name was not set. The SQLite driver requires a database name to be set to emulate MySQL information schema tables.',
-					'db_connect_fail'
-				);
-				return false;
-			}
+		if ( null === $this->dbname || '' === $this->dbname ) {
+			$this->bail(
+				'The database name was not set. The SQLite driver requires a database name to be set to emulate MySQL information schema tables.',
+				'db_connect_fail'
+			);
+			return false;
+		}
 
-			$this->ensure_database_directory( FQDB );
-
-			try {
-				$connection      = new WP_SQLite_Connection(
-					array(
-						'pdo'          => $pdo,
-						'path'         => FQDB,
-						'journal_mode' => defined( 'SQLITE_JOURNAL_MODE' ) ? SQLITE_JOURNAL_MODE : null,
-					)
-				);
-				$this->dbh       = new WP_SQLite_Driver( $connection, $this->dbname );
-				$GLOBALS['@pdo'] = $this->dbh->get_connection()->get_pdo();
-			} catch ( Throwable $e ) {
-				$this->last_error = $this->format_error_message( $e );
-			}
-		} else {
-			$this->dbh        = new WP_SQLite_Translator( $pdo );
-			$this->last_error = $this->dbh->get_error_message();
-			$GLOBALS['@pdo']  = $this->dbh->get_pdo();
+		$this->ensure_database_directory( FQDB );
+
+		try {
+			$connection      = new WP_SQLite_Connection(
+				array(
+					'pdo'          => $pdo,
+					'path'         => FQDB,
+					'journal_mode' => defined( 'SQLITE_JOURNAL_MODE' ) ? SQLITE_JOURNAL_MODE : null,
+				)
+			);
+			$this->dbh       = new WP_SQLite_Driver( $connection, $this->dbname );
+			$GLOBALS['@pdo'] = $this->dbh->get_connection()->get_pdo();
+		} catch ( Throwable $e ) {
+			$this->last_error = $this->format_error_message( $e );
 		}
 		if ( $this->last_error ) {
 			return false;
@@ -467,11 +435,7 @@ class WP_SQLite_DB extends wpdb {
 		if ( preg_match( '/^\s*(create|alter|truncate|drop)\s/i', $query ) ) {
 			$return_val = true;
 		} elseif ( preg_match( '/^\s*(insert|delete|update|replace)\s/i', $query ) ) {
-			if ( $this->dbh instanceof WP_SQLite_Driver ) {
-				$this->rows_affected = $this->dbh->get_last_return_value();
-			} else {
-				$this->rows_affected = $this->dbh->get_affected_rows();
-			}
+			$this->rows_affected = $this->dbh->get_last_return_value();
 
 			// Take note of the insert_id.
 			if ( preg_match( '/^\s*(insert|replace)\s/i', $query ) ) {
@@ -516,11 +480,7 @@ class WP_SQLite_DB extends wpdb {
 			}
 
 			// Add SQLite query data.
-			if ( $this->dbh instanceof WP_SQLite_Driver ) {
-				$this->queries[ $i ]['sqlite_queries'] = $this->dbh->get_last_sqlite_queries();
-			} else {
-				$this->queries[ $i ]['sqlite_queries'] = $this->dbh->executed_sqlite_queries;
-			}
+			$this->queries[ $i ]['sqlite_queries'] = $this->dbh->get_last_sqlite_queries();
 		}
 		return $return_val;
 	}
@@ -545,10 +505,6 @@ class WP_SQLite_DB extends wpdb {
 			$this->last_error = $this->format_error_message( $e );
 		}
 
-		if ( $this->dbh instanceof WP_SQLite_Translator ) {
-			$this->last_error = $this->dbh->get_error_message();
-		}
-
 		++$this->num_queries;
 
 		if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) {
@@ -573,27 +529,23 @@ class WP_SQLite_DB extends wpdb {
 		if ( $this->col_info ) {
 			return;
 		}
-		if ( $this->dbh instanceof WP_SQLite_Driver ) {
-			$this->col_info = array();
-			foreach ( $this->dbh->get_last_column_meta() as $column ) {
-				$this->col_info[] = (object) array(
-					'name'       => $column['name'],
-					'orgname'    => $column['mysqli:orgname'],
-					'table'      => $column['table'],
-					'orgtable'   => $column['mysqli:orgtable'],
-					'def'        => '',    // Unused, always ''.
-					'db'         => $column['mysqli:db'],
-					'catalog'    => 'def', // Unused, always 'def'.
-					'max_length' => 0,     // As of PHP 8.1, this is always 0.
-					'length'     => $column['len'],
-					'charsetnr'  => $column['mysqli:charsetnr'],
-					'flags'      => $column['mysqli:flags'],
-					'type'       => $column['mysqli:type'],
-					'decimals'   => $column['precision'],
-				);
-			}
-		} else {
-			$this->col_info = $this->dbh->get_columns();
+		$this->col_info = array();
+		foreach ( $this->dbh->get_last_column_meta() as $column ) {
+			$this->col_info[] = (object) array(
+				'name'       => $column['name'],
+				'orgname'    => $column['mysqli:orgname'],
+				'table'      => $column['table'],
+				'orgtable'   => $column['mysqli:orgtable'],
+				'def'        => '',    // Unused, always ''.
+				'db'         => $column['mysqli:db'],
+				'catalog'    => 'def', // Unused, always 'def'.
+				'max_length' => 0,     // As of PHP 8.1, this is always 0.
+				'length'     => $column['len'],
+				'charsetnr'  => $column['mysqli:charsetnr'],
+				'flags'      => $column['mysqli:flags'],
+				'type'       => $column['mysqli:type'],
+				'decimals'   => $column['precision'],
+			);
 		}
 	}
 

package/dist/cli/wp-files/sqlite-database-integration/wp-includes/sqlite/db.php

@@ -47,33 +47,11 @@ if ( ! extension_loaded( 'pdo_sqlite' ) ) {
 	);
 }
 
-if ( defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ) {
-	require_once __DIR__ . '/../database/load.php';
-} else {
-	require_once __DIR__ . '/php-polyfills.php';
-	require_once __DIR__ . '/class-wp-sqlite-lexer.php';
-	require_once __DIR__ . '/class-wp-sqlite-query-rewriter.php';
-	require_once __DIR__ . '/class-wp-sqlite-translator.php';
-	require_once __DIR__ . '/class-wp-sqlite-token.php';
-	require_once __DIR__ . '/class-wp-sqlite-pdo-user-defined-functions.php';
-}
+require_once __DIR__ . '/../database/load.php';
 require_once __DIR__ . '/class-wp-sqlite-db.php';
 require_once __DIR__ . '/install-functions.php';
 
-/**
- * The DB_NAME constant is required by the new SQLite driver.
- *
- * There are some existing projects in which the DB_NAME constant is missing in
- * wp-config.php. To enable easier early adoption and testing of the new SQLite
- * driver, let's allow using a default database name when DB_NAME is not set.
- *
- * TODO: For version 3.0, enforce the DB_NAME constant and remove the fallback.
- */
-if ( defined( 'DB_NAME' ) && '' !== DB_NAME ) {
-	$db_name = DB_NAME;
-} else {
-	$db_name = apply_filters( 'wp_sqlite_default_db_name', 'database_name_here' );
-}
+$db_name = defined( 'DB_NAME' ) ? DB_NAME : '';
 
 /*
  * Debug: Cross-check with MySQL.

package/dist/cli/wp-files/sqlite-database-integration/wp-includes/sqlite/install-functions.php

@@ -34,15 +34,11 @@ function sqlite_make_db_sqlite() {
 		wp_die( $message, 'Database Error!' );
 	}
 
-	if ( defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ) {
-		$translator = new WP_SQLite_Driver(
-			new WP_SQLite_Connection( array( 'pdo' => $pdo ) ),
-			$wpdb->dbname
-		);
-	} else {
-		$translator = new WP_SQLite_Translator( $pdo );
-	}
-	$query = null;
+	$translator = new WP_SQLite_Driver(
+		new WP_SQLite_Connection( array( 'pdo' => $pdo ) ),
+		$wpdb->dbname
+	);
+	$query      = null;
 
 	try {
 		$translator->begin_transaction();
@@ -52,21 +48,16 @@ function sqlite_make_db_sqlite() {
 				continue;
 			}
 
-			$result = $translator->query( $query );
-			if ( false === $result ) {
-				throw new PDOException( $translator->get_error_message() );
-			}
+			$translator->query( $query );
 		}
 		$translator->commit();
 	} catch ( PDOException $err ) {
-		$err_data = $err->errorInfo; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
-		$err_code = $err_data[1];
 		$translator->rollback();
 		$message  = sprintf(
 			'Error occurred while creating tables or indexes...<br />Query was: %s<br />',
 			var_export( $query, true )
 		);
-		$message .= sprintf( 'Error message is: %s', $err_data[2] );
+		$message .= sprintf( 'Error message is: %s', $err->getMessage() );
 		wp_die( $message, 'Database Error!' );
 	}
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "wp-studio",
 	"author": "Automattic Inc.",
-	"version": "1.7.10",
+	"version": "1.7.11",
 	"productName": "Studio CLI",
 	"description": "WordPress Studio CLI",
 	"license": "GPL-2.0-or-later",
@@ -43,6 +43,7 @@
 		"cli-table3": "^0.6.5",
 		"fs-extra": "^11.3.4",
 		"http-proxy": "^1.18.1",
+		"ignore": "^7.0.5",
 		"node-forge": "^1.3.3",
 		"patch-package": "^8.0.1",
 		"picospinner": "^3.0.0",

package/dist/cli/well-known-paths-BYA1Bw5o.mjs

@@ -1,214 +0,0 @@
-import { Spinner } from "picospinner";
-import os from "os";
-import path__default from "path";
-const SupportedPHPVersions = ["8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.4"];
-const LatestSupportedPHPVersion = "8.5";
-const SupportedPHPVersionsList = [...SupportedPHPVersions];
-const RecommendedPHPVersion = "8.4";
-const HOUR_MS = 1e3 * 60 * 60;
-const DAY_MS = HOUR_MS * 24;
-const DEMO_SITE_SIZE_LIMIT_GB = 2;
-const DEMO_SITE_SIZE_LIMIT_BYTES = DEMO_SITE_SIZE_LIMIT_GB * 1024 * 1024 * 1024;
-const DEMO_SITE_EXPIRATION_DAYS = 7;
-const CLIENT_ID = "95109";
-const PROTOCOL_PREFIX = "wp-studio";
-const DEFAULT_TOKEN_LIFETIME_MS = DAY_MS * 14;
-const CLI_CONFIG_LOCKFILE_NAME = "cli.json.lock";
-const SHARED_CONFIG_LOCKFILE_NAME = "shared.json.lock";
-const LOCKFILE_STALE_TIME = 5e3;
-const LOCKFILE_WAIT_TIME = 5e3;
-const PLAYGROUND_CLI_INACTIVITY_TIMEOUT = 2 * 60 * 1e3;
-const PLAYGROUND_CLI_MAX_TIMEOUT = 10 * 60 * 1e3;
-const PLAYGROUND_CLI_ACTIVITY_CHECK_INTERVAL = 5 * 1e3;
-const SERVER_AUTH_OID = "1.3.6.1.5.5.7.3.1";
-const CERT_UNTRUSTED_ROOT = "CERT_TRUST_IS_UNTRUSTED_ROOT";
-const MINIMUM_WORDPRESS_VERSION = "6.2.1";
-const DEFAULT_WORDPRESS_VERSION = "latest";
-const DEFAULT_PHP_VERSION = RecommendedPHPVersion;
-const ARCHIVER_OPTIONS = {
-  zip: {
-    zlib: { level: 9 },
-    followSymlinks: true
-  },
-  tar: {
-    gzip: true,
-    gzipOptions: { level: 9 },
-    followSymlinks: true
-  }
-};
-var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
-function getDefaultExportFromCjs(x) {
-  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
-}
-const isIpcMode = Boolean(process.send);
-let progressCallback = null;
-function setProgressCallback(callback) {
-  progressCallback = callback;
-}
-function getProgressCallback() {
-  return progressCallback;
-}
-function emitProgress(message) {
-  progressCallback?.(message);
-}
-function canSend() {
-  return isIpcMode && !!process.send && process.connected;
-}
-class LoggerError extends Error {
-  constructor(message, previousError) {
-    super();
-    this.name = "LoggerError";
-    this.errorMessage = message;
-    if (previousError instanceof Error) {
-      this.previousError = previousError;
-    }
-  }
-  get message() {
-    if (this.previousError) {
-      return `${this.errorMessage}: ${this.previousError.message}`;
-    }
-    return this.errorMessage;
-  }
-}
-class Logger {
-  constructor() {
-    this.currentAction = null;
-    this.spinner = new Spinner();
-  }
-  reportStart(action, message) {
-    this.currentAction = action;
-    if (canSend()) {
-      process.send({ action, status: "inprogress", message });
-    } else if (progressCallback) {
-      progressCallback(message);
-    } else {
-      this.spinner.setText(message);
-      if (!this.spinner.running) {
-        this.spinner.start();
-      }
-    }
-  }
-  reportProgress(message) {
-    if (canSend()) {
-      process.send({ action: this.currentAction, status: "inprogress", message });
-    } else if (progressCallback) {
-      progressCallback(message, true);
-    } else {
-      if (!this.spinner.running) {
-        this.spinner.start();
-      }
-      this.spinner.setText(message);
-    }
-  }
-  reportSuccess(message) {
-    if (canSend()) {
-      process.send({ action: this.currentAction, status: "success", message });
-    } else if (progressCallback) {
-      progressCallback(message);
-    } else {
-      if (!this.spinner.running) {
-        this.spinner.start();
-      }
-      this.spinner.succeed(message);
-    }
-    this.currentAction = null;
-  }
-  reportWarning(message) {
-    if (canSend()) {
-      process.send({ action: this.currentAction, status: "warning", message });
-    } else if (progressCallback) {
-      progressCallback(message);
-    } else {
-      if (!this.spinner.running) {
-        this.spinner.start();
-      }
-      this.spinner.warn(message);
-    }
-  }
-  reportError(error, isFatal = true) {
-    if (isFatal) {
-      process.exitCode = 1;
-    }
-    if (canSend()) {
-      process.send({ action: this.currentAction, status: "fail", message: error.message });
-    } else if (progressCallback) {
-      progressCallback(error.message);
-    } else {
-      if (!this.spinner.running) {
-        this.spinner.start();
-      }
-      this.spinner.fail(error.message);
-    }
-    this.currentAction = null;
-  }
-  reportKeyValuePair(key, value) {
-    if (canSend()) {
-      process.send({ action: "keyValuePair", key, value });
-    }
-  }
-}
-function getConfigDirectory() {
-  if (process.env.DEV_CONFIG_DIR) {
-    return process.env.DEV_CONFIG_DIR;
-  }
-  if (process.env.E2E && process.env.E2E_SHARED_CONFIG_PATH) {
-    return process.env.E2E_SHARED_CONFIG_PATH;
-  }
-  return path__default.join(os.homedir(), ".studio");
-}
-function getSharedConfigPath() {
-  return path__default.join(getConfigDirectory(), "shared.json");
-}
-function getAppConfigPath() {
-  return path__default.join(getConfigDirectory(), "app.json");
-}
-function getCliConfigPath() {
-  if (process.env.E2E && process.env.E2E_CLI_CONFIG_PATH) {
-    return path__default.join(process.env.E2E_CLI_CONFIG_PATH, "cli.json");
-  }
-  return path__default.join(getConfigDirectory(), "cli.json");
-}
-function getCertificatesPath() {
-  return path__default.join(getConfigDirectory(), "certificates");
-}
-function getServerFilesPath() {
-  return path__default.join(getConfigDirectory(), "server-files");
-}
-export {
-  ARCHIVER_OPTIONS as A,
-  CLIENT_ID as B,
-  CLI_CONFIG_LOCKFILE_NAME as C,
-  DEFAULT_PHP_VERSION as D,
-  DEFAULT_TOKEN_LIFETIME_MS as E,
-  HOUR_MS as H,
-  LoggerError as L,
-  MINIMUM_WORDPRESS_VERSION as M,
-  PLAYGROUND_CLI_MAX_TIMEOUT as P,
-  SupportedPHPVersionsList as S,
-  LOCKFILE_STALE_TIME as a,
-  LOCKFILE_WAIT_TIME as b,
-  LatestSupportedPHPVersion as c,
-  Logger as d,
-  PLAYGROUND_CLI_INACTIVITY_TIMEOUT as e,
-  PLAYGROUND_CLI_ACTIVITY_CHECK_INTERVAL as f,
-  getDefaultExportFromCjs as g,
-  getServerFilesPath as h,
-  commonjsGlobal as i,
-  getSharedConfigPath as j,
-  getConfigDirectory as k,
-  SHARED_CONFIG_LOCKFILE_NAME as l,
-  DEMO_SITE_EXPIRATION_DAYS as m,
-  DAY_MS as n,
-  DEMO_SITE_SIZE_LIMIT_BYTES as o,
-  DEMO_SITE_SIZE_LIMIT_GB as p,
-  DEFAULT_WORDPRESS_VERSION as q,
-  emitProgress as r,
-  setProgressCallback as s,
-  getProgressCallback as t,
-  getCliConfigPath as u,
-  getCertificatesPath as v,
-  CERT_UNTRUSTED_ROOT as w,
-  SERVER_AUTH_OID as x,
-  getAppConfigPath as y,
-  PROTOCOL_PREFIX as z
-};