wip

Author: JanJakes

.github/workflows/verify-version.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Extract version from "load.php"
         id: load_version
         run: |
-          VERSION=$(grep "Version:" load.php | sed "s/.*Version: \([^ ]*\).*/\1/")
+          VERSION=$(grep "Version:" packages/sqlite-database-integration/load.php | sed "s/.*Version: \([^ ]*\).*/\1/")
           echo "load_version=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Extract version from "version.php"

packages/sqlite-database-integration/wp-includes/sqlite/db.php

@@ -48,7 +48,7 @@
 }
 
 if ( defined( 'WP_SQLITE_AST_DRIVER' ) && WP_SQLITE_AST_DRIVER ) {
-	require_once __DIR__ . '/../../wp-pdo-mysql-on-sqlite.php';
+	require_once dirname( __DIR__, 4 ) . '/wp-pdo-mysql-on-sqlite.php';
 } else {
 	require_once __DIR__ . '/php-polyfills.php';
 	require_once __DIR__ . '/class-wp-sqlite-lexer.php';
@@ -81,7 +81,7 @@
  * that are present in the GitHub repository
  * but not the plugin published on WordPress.org.
  */
-$crosscheck_tests_file_path = dirname( __DIR__, 2 ) . '/tests/class-wp-sqlite-crosscheck-db.php';
+$crosscheck_tests_file_path = __DIR__ . '/class-wp-sqlite-crosscheck-db.php';
 if ( defined( 'SQLITE_DEBUG_CROSSCHECK' ) && SQLITE_DEBUG_CROSSCHECK && file_exists( $crosscheck_tests_file_path ) ) {
 	require_once $crosscheck_tests_file_path;
 	$GLOBALS['wpdb'] = new WP_SQLite_Crosscheck_DB( $db_name );

packages/wp-mysql-on-sqlite/tests/bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 
 require_once __DIR__ . '/wp-sqlite-schema.php';
-require_once __DIR__ . '/../load.php';
+require_once __DIR__ . '/../src/load.php';
 
 // When on an older SQLite version, enable unsafe back compatibility.
 $sqlite_version = ( new PDO( 'sqlite::memory:' ) )->query( 'SELECT SQLITE_VERSION();' )->fetch()[0];

packages/wp-mysql-proxy/tests/WP_MySQL_Proxy_PDO_Test.php

@@ -7,7 +7,7 @@ class WP_MySQL_Proxy_PDO_Test extends WP_MySQL_Proxy_Test {
 	public function setUp(): void {
 		parent::setUp();
 
-		$pdo_class = PHP_VERSION_ID >= 80400 ? PDO\SQLite::class : PDO::class;
+		$pdo_class = PHP_VERSION_ID >= 80400 ? PDO\MySQL::class : PDO::class;
 		$this->pdo = new $pdo_class(
 			sprintf( 'mysql:host=127.0.0.1;port=%d', $this->port ),
 			'user',

wp-setup.sh

@@ -56,9 +56,9 @@ EOF
 # 4. Add "db.php" to the "wp-content" directory.
 echo "Adding 'db.php' to the 'wp-content' directory..."
 rm -f "$WP_DIR"/src/wp-content/db.php
-cp "$DIR"/db.copy "$WP_DIR"/src/wp-content/db.php
-sed -i.bak "s#'{SQLITE_IMPLEMENTATION_FOLDER_PATH}'#__DIR__.'/plugins/sqlite-database-integration'#g" "$WP_DIR"/src/wp-content/db.php
-sed -i.bak "s#{SQLITE_PLUGIN}#$WP_DIR/src/wp-content/plugins/sqlite-database-integration/load.php#g" "$WP_DIR"/src/wp-content/db.php
+cp "$DIR"/packages/sqlite-database-integration/db.copy "$WP_DIR"/src/wp-content/db.php
+sed -i.bak "s#'{SQLITE_IMPLEMENTATION_FOLDER_PATH}'#__DIR__.'/plugins/sqlite-database-integration/packages/sqlite-database-integration'#g" "$WP_DIR"/src/wp-content/db.php
+sed -i.bak "s#{SQLITE_PLUGIN}#sqlite-database-integration/packages/sqlite-database-integration/load.php#g" "$WP_DIR"/src/wp-content/db.php
 
 # 5. Rewrite helper class WpdbExposedMethodsForTesting to extend WP_SQLite_DB.
 echo "Rewriting helper class 'WpdbExposedMethodsForTesting' to extend WP_SQLite_DB..."