From b286210dca3f360f215c9a33555f6e8e87e0fea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Tue, 4 Feb 2020 23:15:29 +0100
Subject: [PATCH] Enhancement: Use shivammathur/setup-php to install PHP

---
 .github/workflows/continuous-integration.yml | 85 +++++++++++++-------
 1 file changed, 56 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index e6f1e856a8..b6a529759e 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -16,16 +16,19 @@ jobs:
 
     strategy:
       matrix:
-        php-binary:
-          - "php7.1"
-          - "php7.2"
-          - "php7.3"
-          - "php7.4"
+        php-version:
+          - "7.1"
 
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2.0.0"
 
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@1.8.2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+
       - name: "Validate Composer"
         run: "composer validate --strict"
 
@@ -33,8 +36,8 @@ jobs:
         uses: "actions/cache@v1.0.3"
         with:
           path: "~/.composer/cache"
-          key: "${{ matrix.php-binary }}-composer-${{ hashFiles('**/composer.json') }}"
-          restore-keys: "${{ matrix.php-binary }}-composer-"
+          key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
+          restore-keys: "php-${{ matrix.php-version }}-composer-"
 
       - name: "Install dependencies"
         run: "composer update --no-interaction --no-progress --no-suggest"
@@ -52,19 +55,25 @@ jobs:
 
     strategy:
       matrix:
-        php-binary:
-          - "php7.4"
+        php-version:
+          - "7.4"
 
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2.0.0"
 
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@1.8.2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+
       - name: "Cache dependencies"
         uses: "actions/cache@v1.0.3"
         with:
           path: "~/.composer/cache"
-          key: "${{ matrix.php-binary }}-composer-${{ hashFiles('**/composer.json') }}"
-          restore-keys: "${{ matrix.php-binary }}-composer-"
+          key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
+          restore-keys: "php-${{ matrix.php-version }}-composer-"
 
       - name: "Install dependencies"
         run: "composer update --no-interaction --no-progress --no-suggest"
@@ -79,22 +88,28 @@ jobs:
 
     strategy:
       matrix:
-        php-binary:
-          - "php7.1"
-          - "php7.2"
-          - "php7.3"
-          - "php7.4"
+        php-version:
+          - "7.1"
+          - "7.2"
+          - "7.3"
+          - "7.4"
 
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2.0.0"
 
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@1.8.2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+
       - name: "Cache dependencies"
         uses: "actions/cache@v1.0.3"
         with:
           path: "~/.composer/cache"
-          key: "${{ matrix.php-binary }}-composer-${{ hashFiles('**/composer.json') }}"
-          restore-keys: "${{ matrix.php-binary }}-composer-"
+          key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
+          restore-keys: "php-${{ matrix.php-version }}-composer-"
 
       - name: "Install dependencies"
         run: "composer update --no-interaction --no-progress --no-suggest"
@@ -109,22 +124,28 @@ jobs:
 
     strategy:
       matrix:
-        php-binary:
-          - "php7.1"
-          - "php7.2"
-          - "php7.3"
-          - "php7.4"
+        php-version:
+          - "7.1"
+          - "7.2"
+          - "7.3"
+          - "7.4"
 
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2.0.0"
 
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@1.8.2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+
       - name: "Cache dependencies"
         uses: "actions/cache@v1.0.3"
         with:
           path: "~/.composer/cache"
-          key: "${{ matrix.php-binary }}-composer-${{ hashFiles('**/composer.json') }}"
-          restore-keys: "${{ matrix.php-binary }}-composer-"
+          key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
+          restore-keys: "php-${{ matrix.php-version }}-composer-"
 
       - name: "Install dependencies"
         run: "composer update --no-interaction --no-progress --no-suggest"
@@ -139,19 +160,25 @@ jobs:
 
     strategy:
       matrix:
-        php-binary:
-          - "php7.4"
+        php-version:
+          - "7.4"
 
     steps:
       - name: "Checkout"
         uses: "actions/checkout@v2.0.0"
 
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@1.8.2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+
       - name: "Cache dependencies"
         uses: "actions/cache@v1.0.3"
         with:
           path: "~/.composer/cache"
-          key: "${{ matrix.php-binary }}-composer-${{ hashFiles('**/composer.json') }}"
-          restore-keys: "${{ matrix.php-binary }}-composer-"
+          key: "php-${{ matrix.php-version }}-composer-${{ hashFiles('**/composer.json') }}"
+          restore-keys: "php-${{ matrix.php-version }}-composer-"
 
       - name: "Install dependencies"
         run: "composer update --no-interaction --no-progress --no-suggest"