From cfd32761c221a3f921232f94691dc3cd4fce823f Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@google.com>
Date: Wed, 31 Jan 2024 11:42:10 -0800
Subject: [PATCH] Align workflows for testing and use composer install in
 php-test

---
 .github/workflows/php-test-standalone-plugins.yml |  4 ++--
 .github/workflows/php-test.yml                    | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/php-test-standalone-plugins.yml b/.github/workflows/php-test-standalone-plugins.yml
index 410ae38028..ce8dd2eb28 100644
--- a/.github/workflows/php-test-standalone-plugins.yml
+++ b/.github/workflows/php-test-standalone-plugins.yml
@@ -66,14 +66,14 @@ jobs:
         with:
           node-version-file: '.nvmrc'
           cache: npm
-      - name: npm install
-        run: npm ci
       - name: General debug information
         run: |
           npm --version
           node --version
           composer --version
           php -v
+      - name: npm install
+        run: npm ci
       - name: Building standalone plugins
         run: npm run build-plugins
       - name: Running single site standalone plugin integration tests
diff --git a/.github/workflows/php-test.yml b/.github/workflows/php-test.yml
index 7b761dd0ab..d0d37a6f86 100644
--- a/.github/workflows/php-test.yml
+++ b/.github/workflows/php-test.yml
@@ -58,13 +58,22 @@ jobs:
     steps:
       - uses: styfle/cancel-workflow-action@0.11.0
       - uses: actions/checkout@v3
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
       - name: Setup Node.js (.nvmrc)
         uses: actions/setup-node@v3
         with:
           node-version-file: '.nvmrc'
           cache: npm
-      - name: Composer update
-        run: composer update
+      - name: General debug information
+        run: |
+          npm --version
+          node --version
+          composer --version
+          php -v
+      - name: Composer install
+        run: composer install
       - name: npm install
         run: npm ci
       - name: Install WordPress