Merge branch 'main' into copilot/add-wp-profile-queries

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

features/profile-stage.feature

@@ -134,6 +134,17 @@ Feature: Profile the template render stage
       Error: Invalid stage. Must be one of bootstrap, main_query, template, or use --all.
       """
 
+  @require-wp-4.0
+  Scenario: Invalid field name supplied to --fields
+    Given a WP install
+
+    When I try `wp profile stage template --fields=test`
+    Then STDERR should contain:
+      """
+      Invalid field(s): test
+      """
+    And the return code should be 1
+
   @require-wp-4.0
   Scenario: Identify callback_count for each hook
     Given a WP install

src/Formatter.php

@@ -27,11 +27,22 @@ public function __construct( &$assoc_args, $fields = null, $prefix = false ) {
 			$format_args['fields'] = explode( ',', $format_args['fields'] );
 		}
 
-		if ( 'time' !== $fields[0] ) {
-			$this->total_cell_index = array_search( $fields[0], $format_args['fields'], true );
+		$format_args['fields'] = array_filter( array_map( 'trim', $format_args['fields'] ) );
+
+		if ( isset( $assoc_args['fields'] ) ) {
+			if ( empty( $format_args['fields'] ) ) {
+				$format_args['fields'] = $fields;
+			}
+			$invalid_fields = array_diff( $format_args['fields'], $fields );
+			if ( ! empty( $invalid_fields ) ) {
+				\WP_CLI::error( 'Invalid field(s): ' . implode( ', ', $invalid_fields ) );
+			}
 		}
 
-		$format_args['fields'] = array_map( 'trim', $format_args['fields'] );
+		if ( 'time' !== $fields[0] ) {
+			$index                  = array_search( $fields[0], $format_args['fields'], true );
+			$this->total_cell_index = ( false !== $index ) ? $index : null;
+		}
 
 		$this->args      = $format_args;
 		$this->formatter = new \WP_CLI\Formatter( $assoc_args, $fields, $prefix );