From a4396ff9feeff7dae2796ca027dea6eaeb55e83e Mon Sep 17 00:00:00 2001
From: Barbara-Pitt <76412907+Barbara-Pitt@users.noreply.github.com>
Date: Sun, 27 Dec 2020 03:33:14 -0600
Subject: [PATCH 1/5] Update php.yml

---
 .github/workflows/php.yml | 62 ++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 2cab0aa0..712e0f96 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -8,30 +8,38 @@ on:
 
 jobs:
   build:
-
-    runs-on: ubuntu-16.04
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Validate composer.json and composer.lock
-      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
-      if: steps.composer-cache.outputs.cache-hit != 'true'
-      run: composer install --prefer-dist --no-progress --no-suggest
-
-    # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
-    # Docs: https://getcomposer.org/doc/articles/scripts.md
-
-    - name: Run test suite
-      run: composer run-script test
+      strategy:
+        matrix:
+          php: ['5.6.40']
+          os: ['ubuntu-16.04']
+          include:
+            - php: '5.6.40'
+              os: 'ubuntu-16.04'
+    
+      runs-on: ${{ matrix.os }}
+      env:
+          PHP_VERSION: ${{ matrix.php }}
+      steps:
+      - uses: actions/checkout@v2
+
+      - name: Validate composer.json and composer.lock
+        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
+        if: steps.composer-cache.outputs.cache-hit != 'true'
+        run: composer install --prefer-dist --no-progress --no-suggest
+
+      # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"
+      # Docs: https://getcomposer.org/doc/articles/scripts.md
+
+      - name: Run test suite
+        run: composer run-script test

From 63ec76a0b0cf76c472079da7c6858da9295a87a6 Mon Sep 17 00:00:00 2001
From: Barbara-Pitt <76412907+Barbara-Pitt@users.noreply.github.com>
Date: Sun, 27 Dec 2020 03:36:07 -0600
Subject: [PATCH 2/5] Update php.yml

---
 .github/workflows/php.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 712e0f96..1a3fe955 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -10,10 +10,10 @@ jobs:
   build:
       strategy:
         matrix:
-          php: ['5.6.40']
+          php: ['5.6']
           os: ['ubuntu-16.04']
           include:
-            - php: '5.6.40'
+            - php: '5.6'
               os: 'ubuntu-16.04'
     
       runs-on: ${{ matrix.os }}
@@ -30,9 +30,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: vendor
-          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          key: ${{ matrix.os }}-php-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-php-
+            ${{ matrix.os }}-php-
 
       - name: Install dependencies
         if: steps.composer-cache.outputs.cache-hit != 'true'

From a3b2c96df5d0ae95c6454b540150de10f3ca50dc Mon Sep 17 00:00:00 2001
From: Barbara-Pitt <76412907+Barbara-Pitt@users.noreply.github.com>
Date: Sun, 27 Dec 2020 03:40:57 -0600
Subject: [PATCH 3/5] Update php.yml

---
 .github/workflows/php.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 1a3fe955..60bf36fe 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -21,6 +21,9 @@ jobs:
           PHP_VERSION: ${{ matrix.php }}
       steps:
       - uses: actions/checkout@v2
+        
+      - name: Install composer
+        run: composer install --prefer-dist --no-progress --no-suggest
 
       - name: Validate composer.json and composer.lock
         run: composer validate

From 43c333654dcbd0bfe02d0270e94876bc3d85db98 Mon Sep 17 00:00:00 2001
From: Barbara-Pitt <76412907+Barbara-Pitt@users.noreply.github.com>
Date: Sun, 27 Dec 2020 03:46:50 -0600
Subject: [PATCH 4/5] Update php.yml

---
 .github/workflows/php.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 60bf36fe..079d1d6a 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -21,9 +21,6 @@ jobs:
           PHP_VERSION: ${{ matrix.php }}
       steps:
       - uses: actions/checkout@v2
-        
-      - name: Install composer
-        run: composer install --prefer-dist --no-progress --no-suggest
 
       - name: Validate composer.json and composer.lock
         run: composer validate
@@ -33,6 +30,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: vendor
+          php-version: '5.6'
           key: ${{ matrix.os }}-php-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ matrix.os }}-php-

From 122d3e9f0537fa345eb967da2bef6866485de741 Mon Sep 17 00:00:00 2001
From: Barbara-Pitt <76412907+Barbara-Pitt@users.noreply.github.com>
Date: Sun, 27 Dec 2020 03:49:45 -0600
Subject: [PATCH 5/5] Update php.yml

---
 .github/workflows/php.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 079d1d6a..3c583c93 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -20,23 +20,11 @@ jobs:
       env:
           PHP_VERSION: ${{ matrix.php }}
       steps:
-      - uses: actions/checkout@v2
 
       - name: Validate composer.json and composer.lock
         run: composer validate
 
-      - name: Cache Composer packages
-        id: composer-cache
-        uses: actions/cache@v2
-        with:
-          path: vendor
-          php-version: '5.6'
-          key: ${{ matrix.os }}-php-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ matrix.os }}-php-
-
       - name: Install dependencies
-        if: steps.composer-cache.outputs.cache-hit != 'true'
         run: composer install --prefer-dist --no-progress --no-suggest
 
       # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit"