Update PHP reusable workflows

.github/workflows/php-build.yml

@@ -3,62 +3,72 @@ name: PHP Build and Archive
 on: 
   workflow_call:
     inputs:
-      cache-deps:
-        description: 'Whether to cache composer dependencies'
+      cache_deps:
+        description: 'Whether to cache composer dependencies.'
         default: true
         required: false
         type: boolean
-      php-versions:
-        description: 'The PHP versions to create builds for (as JSON string array)'
+      composer_args:
+        description: 'The arguments to pass to composer when installing dependencies.'
+        default: ''
+        required: false
+        type: string
+      php_versions:
+        description: 'The PHP versions to create builds for (as JSON string array).'
         default: '["latest"]'
         required: false
         type: string
-      upload-artifact:
-        description: 'Whether to upload the build archive for reuse (filename format e.g. build-archive-php8.1)'
+      upload_artifact:
+        description: 'Whether to upload the build archive(s) as artifact(s).'
         default: true
         required: false
         type: boolean
+      upload_artifact_prefix:
+        description: 'The prefix to use for uploaded artifact name(s), if enabled.'
+        default: 'build-archive-php'
+        required: false
+        type: string
 
 jobs:
   build:
+    name: 'PHP ${{ matrix.php }}'
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: ${{ fromJSON(inputs.php-versions) }}
-
-    name: 'PHP ${{ matrix.php }}'
+        php: ${{ fromJSON(inputs.php_versions) }}
     steps:
       - uses: actions/checkout@v4
 
-      - name: Validate composer.json and composer.lock
+      - name: 'Validate composer.json and composer.lock'
         uses: php-actions/composer@v6
         with:
           command: validate
+          php_version: ${{ matrix.php }}
 
-      - name: Cache Composer Dependencies
-        if: ${{ inputs.cache-deps }}
+      - name: 'Cache Composer Dependencies'
         id: composer-cache
+        if: ${{ inputs.cache_deps }}
         uses: actions/cache@v3
         with:
-          path: ./src/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
+          path: './src/vendor'
 
-      - name: Install Composer Dependencies
+      - name: 'Install Composer Dependencies'
         if: ${{ steps.composer-cache.outputs.cache-hit != 'true' }}
         uses: php-actions/composer@v6
         with:
+          args: ${{ inputs.composer_args }}
           php_version: ${{ matrix.php }}
 
-      - name: Create Build Archive
+      - name: 'Create Build Archive'
         run: |
           mkdir /tmp/builds/ && tar -cvf /tmp/builds/build.tar ./
 
-      - name: Upload Build Archive
-        if: ${{ inputs.upload-artifact }}
+      - name: 'Upload Build Archive'
+        if: ${{ inputs.upload_artifact }}
         uses: actions/upload-artifact@v3
         with:
-          name: build-archive-php${{ matrix.php }}
-          path: /tmp/builds
+          if-no-files-found: 'error'
+          name: ${{ inputs.upload_artifact_prefix }} ${{ matrix.php }}
+          path: '/tmp/builds'
           retention-days: 1

.github/workflows/php-test.yml

@@ -13,6 +13,11 @@ on:
         default: true
         required: false
         type: boolean
+      download_artifact_prefix:
+        description: ''
+        default: 'build-archive-php'
+        required: false
+        type: string
       download-test-files:
         description: 'Whether to download files required for the test (artifact must be named test-files)'
         default: false
@@ -86,7 +91,7 @@ jobs:
         if: ${{ inputs.download-artifact }}
         uses: actions/download-artifact@v3
         with:
-          name: build-archive-php${{ matrix.php }}
+          name: build-dev-php${{ matrix.php }}
           path: /tmp/builds
 
       - name: Extract Build Archive