From 6a894619726d4b6c31cbba51026e60a052d3406f Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Wed, 8 Sep 2021 13:17:15 +0200
Subject: [PATCH] Use GitHub Action to install expected composer version

---
 .github/workflows/ci.yaml | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index dc0f465..b3dc541 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -25,6 +25,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: "${{ matrix.php-version }}"
+          tools: composer:v2
 
       - name: PHP lint
         run: "find *.php Classes Configuration Tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l"
@@ -39,6 +40,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: "7.4"
+          tools: composer:v2
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -52,9 +54,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: Use expected composer version
-        run: sudo composer selfupdate --2
-
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress --no-suggest --no-plugins
 
@@ -71,6 +70,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: "7.4"
+          tools: composer:v2
 
       - name: Install xmllint
         run: sudo apt-get install libxml2-utils
@@ -87,9 +87,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: Use expected composer version
-        run: sudo composer selfupdate --2
-
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress --no-suggest
 
@@ -114,6 +111,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: "7.4"
+          tools: composer:v2
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -127,9 +125,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: Use expected composer version
-        run: sudo composer selfupdate --2
-
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress --no-suggest
 
@@ -146,6 +141,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: "7.4"
+          tools: composer:v2
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -159,9 +155,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: Use expected composer version
-        run: sudo composer selfupdate --2
-
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress --no-suggest
 
@@ -185,6 +178,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: "${{ matrix.php-version }}"
+          tools: composer:v2
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -198,9 +192,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: Use expected composer version
-        run: sudo composer selfupdate --2
-
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress --no-suggest
 
@@ -224,6 +215,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: "${{ matrix.php-version }}"
+          tools: composer:v2
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -237,9 +229,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: Use expected composer version
-        run: sudo composer selfupdate --2
-
       - name: Setup MySQL
         uses: mirromutth/mysql-action@v1.1
         with: