Merge branch 'main' into copilot/fix-wp-config-mustache-file

Author: swissspidy

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

@@ -36,9 +36,6 @@ jobs:
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v3
+        uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v4
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
-        with:
-          # Bust the cache at least once a month - output format: YYYY-MM.
-          custom-cache-suffix: $(date -u "+%Y-%m")

.github/workflows/deployment.yml

@@ -16,20 +16,20 @@ jobs:
     if: ${{ github.repository_owner == 'wp-cli' }}
     steps:
       - name: Check out source code
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up PHP environment
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2
         with:
-          php-version: '7.4'
+          php-version: 'latest'
           extensions: mysql, zip, imagick
           coverage: none
-          tools: composer:2.2
+          tools: composer
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Composer dependencies & cache dependencies
-        uses: "ramsey/composer-install@v3"
+        uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v4
         env:
           COMPOSER_ROOT_VERSION: 'dev-main'
         with:
@@ -49,13 +49,13 @@ jobs:
           echo "$CLI_VERSION" > cli_version.txt
 
       - name: Upload WP-CLI version
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
         with:
           name: cli_version
           path: cli_version.txt
 
       - name: Upload manifest file
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
         with:
           name: manifest
           path: vendor/wp-cli/wp-cli/manifest.json
@@ -64,7 +64,7 @@ jobs:
         run: php -dphar.readonly=0 utils/make-phar.php wp-cli.phar --version=$CLI_VERSION
 
       - name: Upload built Phar file
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7
         with:
           name: wp-cli-phar
           path: wp-cli.phar
@@ -107,15 +107,15 @@ jobs:
     if: ${{ github.repository_owner == 'wp-cli' }}
     steps:
       - name: Check out source code
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Install Ghostscript
         run: |
           sudo apt-get update
           sudo apt-get install ghostscript -y
 
       - name: Set up PHP environment
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2
         with:
           php-version: '${{ matrix.php }}'
           extensions: imagick, mysql, zip
@@ -125,7 +125,7 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Composer dependencies & cache dependencies
-        uses: "ramsey/composer-install@v3"
+        uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v4
         env:
           COMPOSER_ROOT_VERSION: 'dev-main'
         with:
@@ -149,7 +149,7 @@ jobs:
 
       - name: Setup MySQL Server
         id: setup-mysql
-        uses: shogo82148/actions-setup-mysql@v1
+        uses: shogo82148/actions-setup-mysql@840178c12b07a58353c6312be784c23b63756eea # v1
         with:
           mysql-version: ${{ matrix.mysql }}
           auto-start: true
@@ -189,7 +189,7 @@ jobs:
     if: ${{ github.repository_owner == 'wp-cli' && github.event_name != 'workflow_dispatch' }}
     steps:
       - name: Check out builds repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           repository: wp-cli/builds
           token: ${{ secrets.ACTIONS_BOT }}
@@ -264,7 +264,7 @@ jobs:
 
     steps:
       - name: Check out builds repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           repository: wp-cli/builds
           token: ${{ secrets.ACTIONS_BOT }}
@@ -318,7 +318,7 @@ jobs:
 
     steps:
       - name: Check out builds repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           repository: wp-cli/builds
           token: ${{ secrets.ACTIONS_BOT }}

.github/workflows/update-framework.yml

@@ -24,73 +24,39 @@ jobs:
     if: ${{ github.repository_owner == 'wp-cli' }}
     steps:
       - name: Check out source code
-        uses: actions/checkout@v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Set up PHP environment
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2
         with:
-          php-version: '7.4'
+          php-version: 'latest'
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check existence of composer.json file
         id: check_composer_file
-        uses: andstor/file-existence-action@v3
-        with:
-          files: "composer.json"
+        run: echo "files_exists=$(test -f composer.json && echo true || echo false)" >> "$GITHUB_OUTPUT"
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: "ramsey/composer-install@v3"
+        uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v4
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
         with:
           # Bust the cache at least once a month - output format: YYYY-MM.
           custom-cache-suffix: $(date -u "+%Y-%m")
 
-      - name: Configure git user
-        run: |
-          git config --global user.email "info@wp-cli.org"
-          git config --global user.name "wp-make-coffee"
-
-      - name: Check if remote branch exists
-        run: echo "REMOTE_BRANCH_EXISTS=$([[ -z $(git ls-remote --heads origin update-framework) ]] && echo "0" || echo "1")" >> $GITHUB_ENV
-
-      - name: Create branch to base pull request on
-        if: env.REMOTE_BRANCH_EXISTS == 0
-        run: |
-          git checkout -b update-framework
-
-      - name: Fetch existing branch to add commits to
-        if: env.REMOTE_BRANCH_EXISTS == 1
-        run: |
-          git fetch --all --prune
-          git checkout update-framework
-          git pull --no-rebase
-
       - name: Update wp-cli framework
         run: |
           composer update wp-cli/wp-cli --with-all-dependencies
 
-      - name: Check if there are changes
-        run: echo "CHANGES_DETECTED=$([[ -z $(git status --porcelain) ]] && echo "0" || echo "1")" >> $GITHUB_ENV
-
-      - name: Commit changes
-        if: env.CHANGES_DETECTED == 1
-        run: |
-          git add composer.lock
-          git commit -m "Update wp-cli framework - $(date +'%Y-%m-%d')"
-          git push origin update-framework
-
       - name: Create pull request
-        if: |
-          env.CHANGES_DETECTED == 1 &&
-          env.REMOTE_BRANCH_EXISTS == 0
-        uses: repo-sync/pull-request@v2
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8
         with:
-          source_branch: update-framework
-          destination_branch: ${{ github.event.repository.default_branch }}
-          github_token: ${{ secrets.ACTIONS_BOT }}
-          pr_title: Update wp-cli framework
-          pr_body: "**This is an automated pull-request**\n\nUpdates the `wp-cli/wp-cli` framework to the latest changeset."
-          pr_label: scope:framework
+          branch: update-framework
+          base: ${{ github.event.repository.default_branch }}
+          token: ${{ secrets.ACTIONS_BOT }}
+          title: Update wp-cli framework
+          body: "**This is an automated pull-request**\n\nUpdates the `wp-cli/wp-cli` framework to the latest changeset."
+          labels: scope:framework
+          commit-message: "Update wp-cli framework"

codecov.yml

@@ -10,6 +10,7 @@
   "require": {
     "php": ">=7.2.24",
     "wp-cli/ability-command": "^1",
+    "wp-cli/ai-command": "^1",
     "wp-cli/block-command": "^1",
     "wp-cli/cache-command": "^2",
     "wp-cli/checksum-command": "^2.1",
@@ -27,7 +28,6 @@
     "wp-cli/language-command": "^2",
     "wp-cli/maintenance-mode-command": "^2",
     "wp-cli/media-command": "^2",
-    "wp-cli/package-command": "^2.1",
     "wp-cli/rewrite-command": "^2",
     "wp-cli/role-command": "^2",
     "wp-cli/scaffold-command": "^2",
@@ -41,10 +41,12 @@
   },
   "require-dev": {
     "roave/security-advisories": "dev-latest",
+    "wp-cli/package-command": "^2.1",
     "wp-cli/wp-cli-tests": "^5"
   },
   "suggest": {
-    "psy/psysh": "Enhanced `wp shell` functionality"
+    "psy/psysh": "Enhanced `wp shell` functionality",
+    "wp-cli/package-command": "Manage WP-CLI packages (included in Phar builds, needed for package management when using Composer-based installation)"
   },
   "config": {
     "allow-plugins": {