Merge branch 'main' into copilot/fix-sql-mode-checks

Author: swissspidy

.github/workflows/copilot-setup-steps.yml

@@ -9,23 +9,29 @@ on:
     paths:
       - .github/workflows/copilot-setup-steps.yml
 
+permissions:
+  contents: read
+
 jobs:
   copilot-setup-steps:
+    name: Setup environment
     runs-on: ubuntu-latest
     permissions:
       contents: read
 
     steps:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        with:
+          persist-credentials: false
 
       - name: Check existence of composer.json file
         id: check_composer_file
         run: echo "files_exists=$(test -f composer.json && echo true || echo false)" >> "$GITHUB_OUTPUT"
 
       - name: Set up PHP environment
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2
+        uses: shivammathur/setup-php@7c071dfe9dc99bdf297fa79cb49ea005b9fcadbc # v2
         with:
           php-version: 'latest'
           ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
@@ -36,6 +42,6 @@ jobs:
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v4
+        uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}

README.md

@@ -431,7 +431,7 @@ To confirm the ID for the site you want to query, you can use the `wp site list`
 Exports the database to a file or to STDOUT.
 
 ~~~
-wp db export [<file>] [--dbuser=<value>] [--dbpass=<value>] [--<field>=<value>] [--tables=<tables>] [--exclude_tables=<tables>] [--include-tablespaces] [--porcelain] [--add-drop-table] [--defaults]
+wp db export [<file>] [--dbuser=<value>] [--dbpass=<value>] [--<field>=<value>] [--tables=<tables>] [--exclude_tables=<tables>] [--include-tablespaces] [--porcelain] [--defaults]
 ~~~
 
 **Alias:** `dump`
@@ -466,16 +466,13 @@ Runs `mysqldump` utility using `DB_HOST`, `DB_NAME`, `DB_USER` and
 	[--porcelain]
 		Output filename for the exported database.
 
-	[--add-drop-table]
-		Include a `DROP TABLE IF EXISTS` statement before each `CREATE TABLE` statement.
-
 	[--defaults]
 		Loads the environment's MySQL option files. Default behavior is to skip loading them to avoid failures due to misconfiguration.
 
 **EXAMPLES**
 
-    # Export database with drop query included
-    $ wp db export --add-drop-table
+    # Export database with `--skip-opt` and `--add-drop-table` mysqldump flags
+    $ wp db export --skip-opt --add-drop-table
     Success: Exported to 'wordpress_dbase-db72bb5.sql'.
 
     # Export certain tables

features/db-export.feature

@@ -147,3 +147,16 @@ Feature: Export a WordPress database
 
     When I try `wp db export --no-defaults --debug`
     Then STDERR should match #Debug \(db\): Running initial shell command: /usr/bin/env (mysqldump|mariadb-dump) --no-defaults#
+
+  @skip-sqlite
+  @skip-windows
+  Scenario: Export database when PHP exec() is disabled
+    Given a WP install
+
+    When I try `{INVOKE_WP_CLI_WITH_PHP_ARGS--ddisable_functions=exec} db export wp_cli_test.sql --porcelain`
+    Then the return code should be 0
+    And STDOUT should contain:
+      """
+      wp_cli_test.sql
+      """
+    And the wp_cli_test.sql file should exist

features/db-search.feature

@@ -679,19 +679,19 @@ Feature: Search through the database
       :あいうえおかきくけこさしすせとたちつてと
       """
 
-    When I run `wp db search 'ppppp' --before_context=3 --after_context=4`
+    When I run `wp db search "ppppp" --before_context=3 --after_context=4`
     Then STDOUT should contain:
       """
       :ムnöppppp
       """
 
-    When I run `wp db search 'ppppp' --before_context=1 --after_context=1`
+    When I run `wp db search "ppppp" --before_context=1 --after_context=1`
     Then STDOUT should contain:
       """
       :öppppp
       """
 
-    When I run `wp db search 'ムn' --before_context=2 --after_context=1`
+    When I run `wp db search "ムn" --before_context=2 --after_context=1`
     Then STDOUT should contain:
       """
       :llムnö
@@ -701,7 +701,7 @@ Feature: Search through the database
       :llムnöp
       """
 
-    When I run `wp db search 'ムn' --before_context=2 --after_context=2`
+    When I run `wp db search "ムn" --before_context=2 --after_context=2`
     Then STDOUT should contain:
       """
       :llムnöp
@@ -720,7 +720,7 @@ Feature: Search through the database
     # Note ö is o with combining umlaut.
     And I run `wp option update regextst_combining 'lllllムnöppppp'`
 
-    When I run `wp db search 'https?:\/\/example.c.m' --regex`
+    When I run `wp db search "https?:\/\/example.c.m" --regex`
     Then STDOUT should contain:
       """
       wp_options:option_value
@@ -731,10 +731,10 @@ Feature: Search through the database
       [...]
       """
 
-    When I run `wp db search 'unfindable' --regex`
+    When I run `wp db search "unfindable" --regex`
     Then STDOUT should be empty
 
-    When I try `wp db search 'unfindable' --regex --regex-flags='abcd'`
+    When I try `wp db search "unfindable" --regex --regex-flags="abcd"`
     Then STDERR should contain:
       """
       unfindable
@@ -745,42 +745,42 @@ Feature: Search through the database
       """
     And the return code should be 1
 
-    When I try `wp db search 'unfindable' --regex --regex-delimiter='1'`
+    When I try `wp db search "unfindable" --regex --regex-delimiter="1"`
     Then STDERR should be:
       """
       Error: The regex '1unfindable1' fails.
       """
     And the return code should be 1
 
-    When I try `wp db search 'regex error)' --regex`
+    When I try `wp db search "regex error)" --regex`
     Then STDERR should be:
       """
       Error: The regex pattern 'regex error)' with default delimiter 'chr(1)' and no flags fails.
       """
     And the return code should be 1
 
-    When I try `wp db search 'regex error)' --regex --regex-flags=u`
+    When I try `wp db search "regex error)" --regex --regex-flags=u`
     Then STDERR should be:
       """
       Error: The regex pattern 'regex error)' with default delimiter 'chr(1)' and flags 'u' fails.
       """
     And the return code should be 1
 
-    When I try `wp db search 'regex error)' --regex --regex-delimiter=/`
+    When I try `wp db search "regex error)" --regex --regex-delimiter=#`
     Then STDERR should be:
       """
-      Error: The regex '/regex error)/' fails.
+      Error: The regex '#regex error)#' fails.
       """
     And the return code should be 1
 
-    When I try `wp db search 'regex error)' --regex --regex-delimiter=/ --regex-flags=u`
+    When I try `wp db search "regex error)" --regex --regex-delimiter=# --regex-flags=u`
     Then STDERR should be:
       """
-      Error: The regex '/regex error)/u' fails.
+      Error: The regex '#regex error)#u' fails.
       """
     And the return code should be 1
 
-    When I run `wp db search '[0-9é]+?https:' --regex --regex-flags=u --before_context=0 --after_context=0`
+    When I run `wp db search "[0-9é]+?https:" --regex --regex-flags=u --before_context=0 --after_context=0`
     Then STDOUT should contain:
       """
       :1234567890123456789éhttps:
@@ -794,7 +794,7 @@ Feature: Search through the database
       [...]
       """
 
-    When I run `wp db search 'htt(p(s):)\/\/' --regex --before_context=1 --after_context=3`
+    When I run `wp db search "htt(p(s):)\/\/" --regex --before_context=1 --after_context=3`
     Then STDOUT should contain:
       """
       :あhttps://reg [...] éhttps://reg
@@ -804,7 +804,7 @@ Feature: Search through the database
       rege
       """
 
-    When I run `wp db search 'https://' --regex --regex-delimiter=# --before_context=9 --after_context=11`
+    When I run `wp db search "https://" --regex --regex-delimiter=# --before_context=9 --after_context=11`
     Then STDOUT should contain:
       """
       :2345é789あhttps://regextst.co [...] 23456789éhttps://regextst.co
@@ -814,10 +814,10 @@ Feature: Search through the database
       regextst.com
       """
 
-    When I run `wp db search 'httPs://' --regex --regex-delimiter=# --before_context=3 --after_context=0`
+    When I run `wp db search "httPs://" --regex --regex-delimiter=# --before_context=3 --after_context=0`
     Then STDOUT should be empty
 
-    When I run `wp db search 'httPs://' --regex --regex-flags=i --regex-delimiter=# --before_context=3 --after_context=0`
+    When I run `wp db search "httPs://" --regex --regex-flags=i --regex-delimiter=# --before_context=3 --after_context=0`
     Then STDOUT should contain:
       """
       :89あhttps:// [...] 89éhttps://
@@ -827,19 +827,19 @@ Feature: Search through the database
       https://r
       """
 
-    When I run `wp db search 'ppppp' --regex --before_context=3 --after_context=4`
+    When I run `wp db search "ppppp" --regex --before_context=3 --after_context=4`
     Then STDOUT should contain:
       """
       :ムnöppppp
       """
 
-    When I run `wp db search 'ppppp' --regex --before_context=1 --after_context=1`
+    When I run `wp db search "ppppp" --regex --before_context=1 --after_context=1`
     Then STDOUT should contain:
       """
       :öppppp
       """
 
-    When I run `wp db search 'ムn' --before_context=2 --after_context=1`
+    When I run `wp db search "ムn" --before_context=2 --after_context=1`
     Then STDOUT should contain:
       """
       :llムnö
@@ -849,7 +849,7 @@ Feature: Search through the database
       :llムnöp
       """
 
-    When I run `wp db search 'ムn' --regex --before_context=2 --after_context=2`
+    When I run `wp db search "ムn" --regex --before_context=2 --after_context=2`
     Then STDOUT should contain:
       """
       :llムnöp
@@ -859,7 +859,7 @@ Feature: Search through the database
       :llムnöpp
       """
 
-    When I run `wp db search 't\.c' --regex --before_context=1 --after_context=1`
+    When I run `wp db search "t\.c" --regex --before_context=1 --after_context=1`
     Then STDOUT should contain:
       """
       :st.co [...] st.co [...] st.co [...] 0t.co
@@ -869,7 +869,7 @@ Feature: Search through the database
       st.com
       """
 
-    When I run `wp db search 'https://' --regex`
+    When I run `wp db search "https://" --regex`
     Then the return code should be 0
 
   Scenario: Search with output options
@@ -982,6 +982,7 @@ Feature: Search through the database
     And STDOUT should match /\d tables? skipped:.*wp_term_relationships/
     And STDERR should be empty
 
+  @skip-windows
   Scenario: Search with custom colors
     Given a WP install
 
@@ -1060,7 +1061,7 @@ Feature: Search through the database
     When I run `wp db query "SOURCE esc_sql_ident.sql;"`
     Then STDERR should be empty
 
-    When I run `wp db search 'v_v' TABLE --all-tables`
+    When I run `wp db search "v_v" TABLE --all-tables`
     Then STDOUT should be:
       """
       TABLE:VALUES

features/db-size.feature

@@ -32,6 +32,8 @@ Feature: Display database size
       B
       """
 
+  # On CI, SQLite on Windows is missing the dbstat extension.
+  @skip-windows
   Scenario: Display only table sizes for a WordPress install
     Given a WP install
 
@@ -81,6 +83,8 @@ Feature: Display database size
       KB
       """
 
+  # On CI, SQLite on Windows is missing the dbstat extension.
+  @skip-windows
   Scenario: Display only table sizes in a human readable format for a WordPress install
     Given a WP install
 
@@ -222,6 +226,8 @@ Feature: Display database size
 
     But STDOUT should not be a number
 
+  # On CI, SQLite on Windows is missing the dbstat extension.
+  @skip-windows
   Scenario: Display all table sizes for a WordPress install
     Given a WP install
 
@@ -282,6 +288,8 @@ Feature: Display database size
       [{"Name":"wp_posts",
       """
 
+  # On CI, SQLite on Windows is missing the dbstat extension.
+  @skip-windows
   Scenario: Display ordered table sizes for a WordPress install
     Given a WP install
 

features/db.feature

@@ -256,7 +256,7 @@ Feature: Perform database operations
       1
       """
 
-    When I run `wp db export /tmp/wp-cli-behat.sql`
+    When I run `wp db export wp-cli-behat.sql`
     Then STDOUT should contain:
       """
       Success: Exported
@@ -283,7 +283,7 @@ Feature: Perform database operations
     When I try `wp post list --format=count`
     Then STDERR should not be empty
 
-    When I run `wp db import /tmp/wp-cli-behat.sql`
+    When I run `wp db import wp-cli-behat.sql`
     Then STDOUT should contain:
       """
       Success: Imported
@@ -312,7 +312,7 @@ Feature: Perform database operations
     When I run `wp db create`
     Then STDOUT should not be empty
 
-    When I run `wp db export /tmp/wp-cli-behat.sql`
+    When I run `wp db export wp-cli-behat.sql`
     Then STDOUT should contain:
       """
       Success: Exported
@@ -383,7 +383,8 @@ Feature: Perform database operations
       Query succeeded. Rows affected: 1
       """
 
-  @require-sqlite
+  @require-sqlite @skip-windows
+  # Skipped on Windows due to persistent file locking issues when run via Behat.
   Scenario: SQLite DB CRUD operations
     Given a WP install
     And a session_yes file:
@@ -420,7 +421,8 @@ Feature: Perform database operations
       total
       """
 
-  @require-sqlite
+  @require-sqlite @skip-windows
+  # Skipped on Windows due to persistent file locking issues when run via Behat.
   Scenario: SQLite DB export/import
     Given a WP install
     And a session_yes file:
@@ -434,7 +436,7 @@ Feature: Perform database operations
       1
       """
 
-    When I run `wp db export /tmp/wp-cli-sqlite-behat.sql`
+    When I run `wp db export wp-cli-sqlite-behat.sql`
     Then STDOUT should contain:
       """
       Success: Exported
@@ -446,7 +448,7 @@ Feature: Perform database operations
       Success: Database reset
       """
 
-    When I run `wp db import /tmp/wp-cli-sqlite-behat.sql`
+    When I run `wp db import wp-cli-sqlite-behat.sql`
     Then STDOUT should contain:
       """
       Success: Imported