Remove all remaining usages of SQLite 3

Author: JanJakes

activate.php

@@ -75,8 +75,8 @@ function ( $result ) {
  * When the plugin gets merged in wp-core, this is not to be ported.
  */
 function sqlite_plugin_copy_db_file() {
-	// Bail early if the SQLite3 class does not exist.
-	if ( ! class_exists( 'SQLite3' ) ) {
+	// Bail early if the PDO SQLite extension is not loaded.
+	if ( ! extension_loaded( 'pdo_sqlite' ) ) {
 		return;
 	}
 

admin-notices.php

@@ -19,11 +19,11 @@ function sqlite_plugin_admin_notice() {
 		return;
 	}
 
-	// If SQLite is not detected, bail early.
-	if ( ! class_exists( 'SQLite3' ) ) {
+	// If PDO SQLite is not loaded, bail early.
+	if ( ! extension_loaded( 'pdo_sqlite' ) ) {
 		printf(
 			'<div class="notice notice-error"><p>%s</p></div>',
-			esc_html__( 'The SQLite Integration plugin is active, but the SQLite3 class is missing from your server. Please make sure that SQLite is enabled in your PHP installation.', 'sqlite-database-integration' )
+			esc_html__( 'The SQLite Integration plugin is active, but the PDO SQLite extension is missing from your server. Please make sure that PDO SQLite is enabled in your PHP installation.', 'sqlite-database-integration' )
 		);
 		return;
 	}

admin-page.php

@@ -47,11 +47,7 @@ function sqlite_integration_admin_screen() {
 				?>
 			</p>
 		<?php else : ?>
-			<?php if ( ! class_exists( 'SQLite3' ) ) : ?>
-				<div class="notice notice-error">
-					<p><?php esc_html_e( 'We detected that the SQLite3 class is missing from your server. Please make sure that SQLite is enabled in your PHP installation before proceeding.', 'sqlite-database-integration' ); ?></p>
-				</div>
-			<?php elseif ( ! extension_loaded( 'pdo_sqlite' ) ) : ?>
+			<?php if ( ! extension_loaded( 'pdo_sqlite' ) ) : ?>
 				<div class="notice notice-error">
 					<p><?php esc_html_e( 'We detected that the PDO SQLite driver is missing from your server (the pdo_sqlite extension is not loaded). Please make sure that SQLite is enabled in your PHP installation before proceeding.', 'sqlite-database-integration' ); ?></p>
 				</div>

health-check.php

@@ -31,7 +31,7 @@ function sqlite_plugin_filter_debug_data( $info ) {
 	if ( 'sqlite' === $db_engine ) {
 		$info['wp-database']['fields']['database_version'] = array(
 			'label' => __( 'SQLite version', 'sqlite-database-integration' ),
-			'value' => class_exists( 'SQLite3' ) ? SQLite3::version()['versionString'] : null,
+			'value' => $info['wp-database']['fields']['server_version'] ?? null,
 		);
 
 		$info['wp-database']['fields']['database_file'] = array(