Merge branch 'main' into defaults-problems

Author: swissspidy

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

@@ -17,17 +17,17 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Check existence of composer.json file
         id: check_composer_file
-        uses: andstor/file-existence-action@v3
+        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3
         with:
           files: "composer.json"
 
       - name: Set up PHP environment
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2
         with:
           php-version: 'latest'
           ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
@@ -38,7 +38,7 @@ jobs:
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: ramsey/composer-install@v3
+        uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # v3
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
         with:

.github/workflows/issue-triage.yml

@@ -13,6 +13,13 @@ name: Issue and PR Triage
         required: false
         type: string
 
+permissions:
+  issues: write
+  pull-requests: write
+  actions: write
+  contents: read
+  models: read
+
 jobs:
   issue-triage:
     uses: wp-cli/.github/.github/workflows/reusable-issue-triage.yml@main

.github/workflows/regenerate-readme.yml

@@ -10,6 +10,10 @@ on:
       - "features/**"
       - "README.md"
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   regenerate-readme:
     uses: wp-cli/.github/.github/workflows/reusable-regenerate-readme.yml@main

.github/workflows/welcome-new-contributors.yml

@@ -7,6 +7,9 @@ on:
       - main
       - master
 
+permissions:
+  pull-requests: write
+
 jobs:
   welcome:
     uses: wp-cli/.github/.github/workflows/reusable-welcome-new-contributors.yml@main

.typos.toml

@@ -0,0 +1,6 @@
+[default]
+extend-ignore-re = [
+	"(?Rm)^.*(#|//)\\s*spellchecker:disable-line$",
+	"(?s)(#|//)\\s*spellchecker:off.*?\\n\\s*(#|//)\\s*spellchecker:on",
+	"(#|//)\\s*spellchecker:ignore-next-line\\n.*"
+]

README.md

@@ -303,6 +303,8 @@ Opens a MySQL console using credentials from wp-config.php
 wp db cli [--database=<database>] [--default-character-set=<character-set>] [--dbuser=<value>] [--dbpass=<value>] [--<field>=<value>] [--defaults]
 ~~~
 
+**Alias:** `connect`
+
 **OPTIONS**
 
 	[--database=<database>]
@@ -432,6 +434,8 @@ 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]
 ~~~
 
+**Alias:** `dump`
+
 Runs `mysqldump` utility using `DB_HOST`, `DB_NAME`, `DB_USER` and
 `DB_PASSWORD` database credentials specified in wp-config.php. Accepts any valid `mysqldump` flags.
 

features/db-check.feature

@@ -13,6 +13,25 @@ Feature: Check the database
       Success: Database checked.
       """
 
+  Scenario: db check with --quiet flag should only show errors
+    Given a WP install
+
+    When I run `wp db check --quiet`
+    Then STDOUT should be empty
+
+  Scenario: db check can explicitly pass --silent to mysqlcheck
+    Given a WP install
+
+    When I run `wp db check --silent`
+    Then STDOUT should not contain:
+      """
+      wp_cli_test.wp_users
+      """
+    And STDOUT should contain:
+      """
+      Success: Database checked.
+      """
+
   Scenario: Run db check with MySQL defaults to check the database
     Given a WP install
 

features/db.feature

@@ -185,6 +185,28 @@ Feature: Perform database operations
       """
     And STDOUT should not be empty
 
+  Scenario: db repair with --quiet flag should only show errors
+    Given a WP install
+
+    When I run `wp db repair --quiet`
+    Then STDOUT should not contain:
+      """
+      error
+      """
+
+  Scenario: db repair can explicitly pass --silent to mysqlcheck
+    Given a WP install
+
+    When I run `wp db repair --silent`
+    Then STDOUT should not contain:
+      """
+      error
+      """
+    And STDOUT should contain:
+      """
+      Success: Database repaired.
+      """
+
   Scenario: DB Query
     Given a WP install
 
@@ -334,7 +356,7 @@ Feature: Perform database operations
       """
       Query succeeded. Rows affected: 1
       """
-    
+
     When I run `wp db query "SELECT * FROM wp_users WHERE ID = 1"`
     Then STDOUT should not contain:
       """

src/DB_Command.php

@@ -2,6 +2,7 @@
 
 use WP_CLI\Formatter;
 use WP_CLI\Utils;
+use cli\table\Column;
 
 /**
  * Performs basic database operations using credentials stored in wp-config.php.
@@ -259,6 +260,12 @@ public function check( $_, $assoc_args ) {
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
 
 		$assoc_args['check'] = true;
+
+		// Pass --silent to mysqlcheck when in quiet mode.
+		if ( WP_CLI::get_config( 'quiet' ) ) {
+			$assoc_args['silent'] = true;
+		}
+
 		self::run(
 			Utils\esc_cmd( $command, DB_NAME ),
 			$assoc_args
@@ -307,6 +314,12 @@ public function optimize( $_, $assoc_args ) {
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
 
 		$assoc_args['optimize'] = true;
+
+		// Pass --silent to mysqlcheck when in quiet mode.
+		if ( WP_CLI::get_config( 'quiet' ) ) {
+			$assoc_args['silent'] = true;
+		}
+
 		self::run(
 			Utils\esc_cmd( $command, DB_NAME ),
 			$assoc_args
@@ -355,6 +368,12 @@ public function repair( $_, $assoc_args ) {
 		WP_CLI::debug( "Running shell command: {$command}", 'db' );
 
 		$assoc_args['repair'] = true;
+
+		// Pass --silent to mysqlcheck when in quiet mode.
+		if ( WP_CLI::get_config( 'quiet' ) ) {
+			$assoc_args['silent'] = true;
+		}
+
 		self::run(
 			Utils\esc_cmd( $command, DB_NAME ),
 			$assoc_args
@@ -1199,7 +1218,6 @@ public function size( $args, $assoc_args ) {
 		if ( ! empty( $size_format ) && ! $tables && ! $format && ! $human_readable && true !== $all_tables && true !== $all_tables_with_prefix ) {
 			WP_CLI::line( str_replace( " {$size_format_display}", '', $rows[0]['Size'] ) );
 		} else {
-
 			// Sort the rows by user input
 			if ( $orderby ) {
 				usort(
@@ -1220,7 +1238,8 @@ function ( $a, $b ) use ( $order, $orderby ) {
 
 			// Display the rows.
 			$args = [
-				'format' => $format,
+				'format'     => $format,
+				'alignments' => [ 'Size' => Column::ALIGN_RIGHT ],
 			];
 
 			$formatter = new Formatter( $args, $fields );
@@ -1820,7 +1839,7 @@ private static function run( $cmd, $assoc_args = [], $send_to_shell = true, $int
 			$required['default-character-set'] = constant( 'DB_CHARSET' );
 		}
 
-		// Using 'dbuser' as option name to workaround clash with WP-CLI's global WP 'user' parameter, with 'dbpass' also available for tidyness.
+		// Using 'dbuser' as option name to workaround clash with WP-CLI's global WP 'user' parameter, with 'dbpass' also available for tidiness.
 		if ( isset( $assoc_args['dbuser'] ) ) {
 			$required['user'] = $assoc_args['dbuser'];
 			unset( $assoc_args['dbuser'] );