From 6a972045967673c73ac6d59d2e1d410181dccdab Mon Sep 17 00:00:00 2001
From: Michel Hunziker <micheh@users.noreply.github.com>
Date: Sat, 5 Dec 2020 13:48:55 +0100
Subject: [PATCH] Install the correct version of the symfony packages (#108)

---
 .github/workflows/integrate.yaml | 15 +++++----------
 composer.json                    |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index 30e7b10c..b99e0cb7 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -93,6 +93,7 @@ jobs:
         with:
           coverage: none
           php-version: ${{ matrix.php-version }}
+          tools: flex
 
       - name: "Determine composer cache directory"
         id: determine-composer-cache-directory
@@ -105,17 +106,11 @@ jobs:
           key: php-${{ matrix.php-version }}-composer-${{ matrix.symfony-version }}-${{ hashFiles('composer.json') }}
           restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.symfony-version }}-
 
-      - name: "Install symfony 3 dependencies from composer.json"
-        if: matrix.symfony-version == '3'
-        run: composer require symfony/framework-bundle ^3.0 --prefer-stable --update-with-all-dependencies --no-interaction --no-progress --no-suggest
-
-      - name: "Install Symfony 4 dependencies from composer.json"
-        if: matrix.symfony-version == '4'
-        run: composer require symfony/framework-bundle ^4.0 --prefer-stable --update-with-all-dependencies --no-interaction --no-progress --no-suggest
+      - name: "Restrict symfony dependencies to the correct version"
+        run: composer config extra.symfony.require ${{ matrix.symfony-version }}.*
 
-      - name: "Install Symfony 5 dependencies from composer.json"
-        if: matrix.symfony-version == '5'
-        run: composer require symfony/framework-bundle ^5.0 --prefer-stable --update-with-all-dependencies --no-interaction --no-progress --no-suggest
+      - name: "Update dependencies with restricted symfony version"
+        run: composer update --prefer-stable --no-interaction --no-progress
 
       - name: "Run unit tests with phpunit"
         run: vendor/bin/phpunit --configuration=phpunit.xml
diff --git a/composer.json b/composer.json
index 0cd1ba6d..a7de2c5c 100644
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
         }
     },
     "conflict": {
-        "vimeo/psalm": "~4.2.0"
+        "vimeo/psalm": "~4.2"
     },
     "config": {
         "sort-packages": true