Handle renamed SQLite database file (.ht.sqlite → .ht.sqlite.php) (#318)

Co-authored-by: swissspidy <841956+swissspidy@users.noreply.github.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Pascal Birchler <pascalb@google.com>

Author: Copilot

src/Context/FeatureContext.php

@@ -24,6 +24,7 @@
 use WP_CLI\Process;
 use WP_CLI\ProcessRun;
 use WP_CLI\Utils;
+use WP_CLI\Path;
 use WP_CLI\WpOrgApi;
 
 /**
@@ -1650,7 +1651,13 @@ public function install_wp( $subdir = '', $version = '' ): void {
 
 			// This is the sqlite equivalent of restoring a database dump in MySQL
 			if ( 'sqlite' === self::$db_type ) {
-				copy( "{$install_cache_path}.sqlite", "$run_dir/wp-content/database/.ht.sqlite" );
+				$sqlite_dest_dir = "$run_dir/wp-content/database";
+				if ( ! is_dir( $sqlite_dest_dir ) ) {
+					mkdir( $sqlite_dest_dir, 0755, true );
+				}
+				if ( file_exists( "{$install_cache_path}.sqlite" ) ) {
+					copy( "{$install_cache_path}.sqlite", "$sqlite_dest_dir/.ht.sqlite.php" );
+				}
 			} else {
 				$ssl_flag = 'mariadb' === self::$db_type ? ' --ssl-verify-server-cert' : '';
 				self::run_sql( self::$mysql_binary . ' --no-defaults' . $ssl_flag, [ 'execute' => "source {$install_cache_path}.sql" ], true /*add_database*/ );
@@ -1679,7 +1686,11 @@ public function install_wp( $subdir = '', $version = '' ): void {
 
 			if ( 'sqlite' === self::$db_type ) {
 				// This is the sqlite equivalent of creating a database dump in MySQL
-				$sqlite_source = "$run_dir/wp-content/database/.ht.sqlite";
+				// Support both the new (.ht.sqlite.php) and legacy (.ht.sqlite) file names.
+				$sqlite_source = "$run_dir/wp-content/database/.ht.sqlite.php";
+				if ( ! file_exists( $sqlite_source ) ) {
+					$sqlite_source = "$run_dir/wp-content/database/.ht.sqlite";
+				}
 				if ( file_exists( $sqlite_source ) ) {
 					copy( $sqlite_source, "{$install_cache_path}.sqlite" );
 				} elseif ( file_exists( "{$install_cache_path}.sqlite" ) ) {
@@ -1901,8 +1912,8 @@ private static function get_scenario_key( $scope ): string {
 		$scenario_key = '';
 		$file         = self::get_event_file( $scope, $line );
 		if ( isset( $file ) ) {
-			$scenario_grandparent = Utils\basename( dirname( $file, 2 ) );
-			$scenario_key         = $scenario_grandparent . ' ' . Utils\basename( $file ) . ':' . $line;
+			$scenario_grandparent = Path::basename( dirname( $file, 2 ) );
+			$scenario_key         = $scenario_grandparent . ' ' . Path::basename( $file ) . ':' . $line;
 		}
 		return $scenario_key;
 	}
@@ -1919,7 +1930,7 @@ private static function log_run_times_after_suite( AfterSuiteScope $scope ): voi
 			$suite = substr( $keys[0], 0, strpos( $keys[0], ' ' ) );
 		}
 
-		$run_from = Utils\basename( dirname( __DIR__, 2 ) );
+		$run_from = Path::basename( dirname( __DIR__, 2 ) );
 
 		// Format same as Behat, if have minutes.
 		$fmt = static function ( $time ) {

src/Context/GivenStepDefinitions.php

@@ -6,6 +6,7 @@
 use Behat\Gherkin\Node\TableNode;
 use RuntimeException;
 use WP_CLI\Utils;
+use WP_CLI\Path;
 
 trait GivenStepDefinitions {
 
@@ -45,7 +46,7 @@ public function given_an_empty_directory(): void {
 	 */
 	public function given_a_specific_directory( $empty_or_nonexistent, $dir ): void {
 		$dir = $this->replace_variables( $dir );
-		if ( ! Utils\is_path_absolute( $dir ) ) {
+		if ( ! Path::is_absolute( $dir ) ) {
 			$dir = $this->variables['RUN_DIR'] . "/$dir";
 		}
 

src/Context/ThenStepDefinitions.php

@@ -4,7 +4,7 @@
 
 use Behat\Gherkin\Node\PyStringNode;
 use Behat\Gherkin\Node\TableNode;
-use WP_CLI\Utils;
+use WP_CLI\Path;
 use Exception;
 use Requests;
 use RuntimeException;
@@ -457,7 +457,7 @@ public function then_a_specific_file_folder_should_exist( $path, $type, $strictl
 		$path = $this->replace_variables( $path );
 
 		// If it's a relative path, make it relative to the current test dir.
-		if ( ! Utils\is_path_absolute( $path ) ) {
+		if ( ! Path::is_absolute( $path ) ) {
 			$path = $this->variables['RUN_DIR'] . DIRECTORY_SEPARATOR . $path;
 		}