Merge branch 'main' into fix/like_binary

.github/workflows/cs.yml

@@ -0,0 +1,68 @@
+name: CS
+
+on:
+  # Run on all relevant pushes (except to main) and on all relevant pull requests.
+  push:
+    paths:
+      - '**.php'
+      - 'composer.json'
+      - 'composer.lock'
+      - '.phpcs.xml.dist'
+      - 'phpcs.xml.dist'
+      - '.github/workflows/cs.yml'
+  pull_request:
+    paths:
+      - '**.php'
+      - 'composer.json'
+      - 'composer.lock'
+      - '.phpcs.xml.dist'
+      - 'phpcs.xml.dist'
+      - '.github/workflows/cs.yml'
+  # Allow manually triggering the workflow.
+  workflow_dispatch:
+
+# Cancels all previous workflow runs for the same branch that have not yet completed.
+concurrency:
+  # The concurrency group contains the workflow name and the branch name.
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  checkcs:
+    name: 'Check code style'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@main
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '7.4'
+          coverage: none
+          tools: cs2pr
+
+      # Validate the composer.json file.
+      # @link https://getcomposer.org/doc/03-cli.md#validate
+      - name: Validate Composer installation
+        run: composer validate --no-check-all
+
+      # Install dependencies and handle caching in one go.
+      # @link https://github.com/marketplace/actions/install-composer-dependencies
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v2
+        with:
+          # Bust the cache at least once a month - output format: YYYY-MM.
+          custom-cache-suffix: $(date -u "+%Y-%m")
+
+      # Check the codestyle of the files.
+      # The results of the CS check will be shown inline in the PR via the CS2PR tool.
+      # @link https://github.com/staabm/annotate-pull-request-from-checkstyle/
+      - name: Check PHP code style
+        id: phpcs
+        run: composer check-cs -- --no-cache --report-full --report-checkstyle=./phpcs-report.xml
+
+      - name: Show PHPCS results in PR
+        if: ${{ always() && steps.phpcs.outcome == 'failure' }}
+        run: cs2pr ./phpcs-report.xml

.github/workflows/phpunit-tests-run.yml

@@ -0,0 +1,47 @@
+name: Run PHPUnit tests
+
+on:
+  workflow_call:
+    inputs:
+      os:
+        description: 'Operating system to run tests on'
+        required: false
+        type: 'string'
+        default: 'ubuntu-latest'
+      php:
+        description: 'The version of PHP to use, in the format of X.Y'
+        required: true
+        type: 'string'
+      phpunit-config:
+        description: 'The PHPUnit configuration file to use'
+        required: false
+        type: 'string'
+        default: 'phpunit.xml.dist'
+env:
+  LOCAL_PHP: ${{ inputs.php }}-fpm
+  PHPUNIT_CONFIG: ${{ inputs.phpunit-config }}
+
+jobs:
+  phpunit-tests:
+    name: ${{ inputs.os }}
+    runs-on: ${{ inputs.os }}
+    timeout-minutes: 20
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '${{ inputs.php }}'
+          tools: phpunit-polyfills
+
+      - name: Install Composer dependencies
+        uses: ramsey/composer-install@v3
+        with:
+          ignore-cache: "yes"
+          composer-options: "--optimize-autoloader"
+
+      - name: Run PHPUnit tests
+        run: php ./vendor/bin/phpunit -c ./phpunit.xml.dist 

.github/workflows/phpunit-tests.yml

@@ -0,0 +1,28 @@
+name: PHPUnit Tests
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test:
+    name: PHP ${{ matrix.php }}
+    uses: ./.github/workflows/phpunit-tests-run.yml
+    permissions:
+      contents: read
+    secrets: inherit
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest ]
+        # NOTE: There does not appear to be a single phpunit version that supports all
+        # PHP versions tested here. For now, we are removing PHP 7.0. and 7.1 tests
+        # in order to run a single phpunit version for PHP 7.2 and up.
+        php: [ '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
+
+    with:
+      os: ${{ matrix.os }}
+      php: ${{ matrix.php }}
+      phpunit-config: ${{ 'phpunit.xml.dist' }}

admin-page.php

@@ -58,25 +58,25 @@ function sqlite_integration_admin_screen() {
 			<?php elseif ( file_exists( WP_CONTENT_DIR . '/db.php' ) && ! defined( 'SQLITE_DB_DROPIN_VERSION' ) ) : ?>
 				<?php if ( defined( 'PERFLAB_SQLITE_DB_DROPIN_VERSION' ) ) : ?>
 					<div class="notice notice-warning">
-					<p>
+						<p>
+							<?php
+							printf(
+								/* translators: %s: db.php drop-in path */
+								esc_html__( 'An older %s file was detected. Please click the button below to update the file.', 'sqlite-database-integration' ),
+								'<code>' . esc_html( basename( WP_CONTENT_DIR ) ) . '/db.php</code>'
+							);
+							?>
+						</p>
+					</div>
+					<a class="button button-primary" href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin.php?page=sqlite-integration&confirm-install&upgrade-from-pl' ), 'sqlite-install' ) ); ?>">
 						<?php
 						printf(
 							/* translators: %s: db.php drop-in path */
-							esc_html__( 'An older %s file was detected. Please click the button below to update the file.', 'sqlite-database-integration' ),
+							esc_html__( 'Update %s file', 'sqlite-database-integration' ),
 							'<code>' . esc_html( basename( WP_CONTENT_DIR ) ) . '/db.php</code>'
 						);
 						?>
-					</p>
-				</div>
-				<a class="button button-primary" href="<?php echo esc_url( wp_nonce_url( admin_url( 'admin.php?page=sqlite-integration&confirm-install&upgrade-from-pl' ), 'sqlite-install' ) ); ?>">
-					<?php
-					printf(
-						/* translators: %s: db.php drop-in path */
-						esc_html__( 'Update %s file', 'sqlite-database-integration' ),
-						'<code>' . esc_html( basename( WP_CONTENT_DIR ) ) . '/db.php</code>'
-					);
-					?>
-				</a>
+					</a>
 				<?php else : ?>
 					<div class="notice notice-error">
 						<p>

composer.json

@@ -8,18 +8,32 @@
 		"issues": "https://github.com/wordpress/sqlite-database-integration/issues"
 	},
 	"require": {
-		"php": ">=5.6"
+		"php": ">=7.0"
 	},
 	"require-dev": {
 		"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
 		"squizlabs/php_codesniffer": "^3.7",
-		"wp-coding-standards/wpcs": "^3.0",
-		"phpcompatibility/phpcompatibility-wp": "^2.1",
-		"yoast/phpunit-polyfills": "^1.0.1"
+		"wp-coding-standards/wpcs": "^3.1",
+		"phpcompatibility/phpcompatibility-wp": "*",
+		"php-parallel-lint/php-parallel-lint": "^1.3",
+		"yoast/phpunit-polyfills": "2.0.0",
+		"phpunit/phpunit": "8.5.38"
 	},
 	"config": {
 		"allow-plugins": {
-			"dealerdirect/phpcodesniffer-composer-installer": true
+			"dealerdirect/phpcodesniffer-composer-installer": true,
+			"phpstan/extension-installer": true
 		}
+	},
+	"scripts": {
+		"check-cs": [
+			"@php ./vendor/bin/phpcs"
+		],
+		"fix-cs": [
+			"@php ./vendor/bin/phpcbf"
+		],
+		"test": [
+			"phpunit"
+		]
 	}
 }

load.php

@@ -3,7 +3,7 @@
  * Plugin Name: SQLite Database Integration
  * Description: SQLite database driver drop-in.
  * Author: The WordPress Team
- * Version: 2.1.8
+ * Version: 2.1.13
  * Requires PHP: 7.0
  * Textdomain: sqlite-database-integration
  *
@@ -14,6 +14,7 @@
 
 define( 'SQLITE_MAIN_FILE', __FILE__ );
 
+require_once __DIR__ . '/php-polyfills.php';
 require_once __DIR__ . '/admin-page.php';
 require_once __DIR__ . '/activate.php';
 require_once __DIR__ . '/deactivate.php';

php-polyfills.php

@@ -0,0 +1,54 @@
+<?php
+/**
+ * Polyfills for php 7 & 8 functions
+ *
+ * @package wp-sqlite-integration
+ */
+
+if ( ! function_exists( 'str_starts_with' ) ) {
+	/**
+	 * Check if a string starts with a specific substring.
+	 *
+	 * @param string $haystack The string to search in.
+	 * @param string $needle The string to search for.
+	 *
+	 * @see https://www.php.net/manual/en/function.str-starts-with
+	 *
+	 * @return bool
+	 */
+	function str_starts_with( string $haystack, string $needle ) {
+		return empty( $needle ) || 0 === strpos( $haystack, $needle );
+	}
+}
+
+if ( ! function_exists( 'str_contains' ) ) {
+	/**
+	 * Check if a string contains a specific substring.
+	 *
+	 * @param string $haystack The string to search in.
+	 * @param string $needle The string to search for.
+	 *
+	 * @see https://www.php.net/manual/en/function.str-contains
+	 *
+	 * @return bool
+	 */
+	function str_contains( string $haystack, string $needle ) {
+		return empty( $needle ) || false !== strpos( $haystack, $needle );
+	}
+}
+
+if ( ! function_exists( 'str_ends_with' ) ) {
+	/**
+	 * Check if a string ends with a specific substring.
+	 *
+	 * @param string $haystack The string to search in.
+	 * @param string $needle The string to search for.
+	 *
+	 * @see https://www.php.net/manual/en/function.str-ends-with
+	 *
+	 * @return bool
+	 */
+	function str_ends_with( string $haystack, string $needle ) {
+		return empty( $needle ) || substr( $haystack, -strlen( $needle ) === $needle );
+	}
+}