From c687eb8eca02304b537af5fe07aa67e926c75d09 Mon Sep 17 00:00:00 2001
From: Lewis Cowles <lewis+github@cowles.uk>
Date: Mon, 27 Jun 2022 08:47:31 +0100
Subject: [PATCH 1/2] Attempt to fix composer for 5.6

---
 .github/workflows/main.yml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d778c23..9b8a046 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,29 +16,28 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: shivammathur/setup-php@2.11.0
+    - name: Set up PHP environment
+      if: steps.check_files.outputs.files_exists == 'true'
+      uses: shivammathur/setup-php@v2
       with:
-        php-version: ${{ matrix.php }}
+        php-version: '${{ matrix.php }}'
+        tools: composer
         extensions: 'xdebug'
-
     - uses: actions/checkout@v2
 
+    - name: Install Composer dependencies & cache dependencies
+      if: steps.check_files.outputs.files_exists == 'true'
+      uses: "ramsey/composer-install@v2"
+      with:
+        composer-options: "--prefer-dist"
+        custom-cache-key: "{{ runner.os }}-composer-${{ matrix.php }}"
+      env:
+        COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
+
     - name: Validate composer.json and composer.lock
       #run: composer validate --strict  # Currently we’re installing mf2/tests from a commit ref.
       run: composer validate
 
-    - name: Cache Composer packages
-      id: composer-cache
-      uses: actions/cache@v2
-      with:
-        path: vendor
-        key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-php-
-
-    - name: Install dependencies
-      run: composer install --prefer-dist --no-progress
-
     - name: Run Test Suite
       run: XDEBUG_MODE=coverage ./vendor/bin/phpunit tests --coverage-text
     

From f39f285e75a4b5aac6653ba443a5754fb52fecfe Mon Sep 17 00:00:00 2001
From: Lewis Cowles <lewis+github@cowles.uk>
Date: Mon, 27 Jun 2022 08:50:31 +0100
Subject: [PATCH 2/2] Remove predicate

---
 .github/workflows/main.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9b8a046..b6c72ce 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,7 +17,6 @@ jobs:
 
     steps:
     - name: Set up PHP environment
-      if: steps.check_files.outputs.files_exists == 'true'
       uses: shivammathur/setup-php@v2
       with:
         php-version: '${{ matrix.php }}'
@@ -26,7 +25,6 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Install Composer dependencies & cache dependencies
-      if: steps.check_files.outputs.files_exists == 'true'
       uses: "ramsey/composer-install@v2"
       with:
         composer-options: "--prefer-dist"