From a045c60858399599152ac744e94c1d47e2de0ff6 Mon Sep 17 00:00:00 2001
From: Graham Campbell <graham@alt-three.com>
Date: Sat, 17 Oct 2020 12:26:37 +0100
Subject: [PATCH] Remove old work arounds

---
 .github/workflows/tests.yml | 40 +++++++------------------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3ab78371760c..26002a2cb636 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,15 +50,7 @@ jobs:
       - name: Setup problem matchers
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-      - name: Install PHP 7 dependencies
-        uses: nick-invision/retry@v1
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer update --prefer-dist --no-interaction --no-progress
-        if: "matrix.php < 8"
-
-      - name: Setup PHP 8 Dependencies
+      - name: Setup PHP 8 dependencies
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 5
@@ -66,13 +58,12 @@ jobs:
           command: composer require "phpunit/phpunit:^9.3.3" "doctrine/dbal:^3.0" --no-update --no-interaction
         if: "matrix.php >= 8"
 
-      - name: Install PHP 8 Dependencies
+      - name: Install dependencies
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress --ignore-platform-req=php
-        if: "matrix.php >= 8"
+          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
         run: vendor/bin/phpunit --verbose
@@ -87,15 +78,7 @@ jobs:
       fail-fast: true
       matrix:
         php: [7.2, 7.3, 7.4, 8.0]
-        include:
-          - php: 7.2
-            stability: prefer-lowest
-          - php: 7.3
-            stability: prefer-stable
-          - php: 7.4
-            stability: prefer-stable
-          - php: 8.0
-            stability: prefer-stable
+        stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
 
@@ -119,15 +102,7 @@ jobs:
       - name: Setup problem matchers
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-      - name: Install PHP 7 Dependencies
-        uses: nick-invision/retry@v1
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer update --prefer-dist --no-interaction --no-progress
-        if: "matrix.php < 8"
-
-      - name: Setup PHP 8 Dependencies
+      - name: Setup PHP 8 dependencies
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 5
@@ -135,13 +110,12 @@ jobs:
           command: composer require "phpunit/phpunit:^9.3.3" "doctrine/dbal:^3.0" --no-update --no-interaction
         if: "matrix.php >= 8"
 
-      - name: Install PHP 8 Dependencies
+      - name: Install dependencies
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 5
           max_attempts: 5
-          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress --ignore-platform-req=php
-        if: "matrix.php >= 8"
+          command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
 
       - name: Execute tests
         run: vendor/bin/phpunit --verbose