Skip to content

Commit 6a97204

Browse files
authored
Install the correct version of the symfony packages (#108)
1 parent 2aa06e6 commit 6a97204

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

.github/workflows/integrate.yaml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ jobs:
9393
with:
9494
coverage: none
9595
php-version: ${{ matrix.php-version }}
96+
tools: flex
9697

9798
- name: "Determine composer cache directory"
9899
id: determine-composer-cache-directory
@@ -105,17 +106,11 @@ jobs:
105106
key: php-${{ matrix.php-version }}-composer-${{ matrix.symfony-version }}-${{ hashFiles('composer.json') }}
106107
restore-keys: php-${{ matrix.php-version }}-composer-${{ matrix.symfony-version }}-
107108

108-
- name: "Install symfony 3 dependencies from composer.json"
109-
if: matrix.symfony-version == '3'
110-
run: composer require symfony/framework-bundle ^3.0 --prefer-stable --update-with-all-dependencies --no-interaction --no-progress --no-suggest
111-
112-
- name: "Install Symfony 4 dependencies from composer.json"
113-
if: matrix.symfony-version == '4'
114-
run: composer require symfony/framework-bundle ^4.0 --prefer-stable --update-with-all-dependencies --no-interaction --no-progress --no-suggest
109+
- name: "Restrict symfony dependencies to the correct version"
110+
run: composer config extra.symfony.require ${{ matrix.symfony-version }}.*
115111

116-
- name: "Install Symfony 5 dependencies from composer.json"
117-
if: matrix.symfony-version == '5'
118-
run: composer require symfony/framework-bundle ^5.0 --prefer-stable --update-with-all-dependencies --no-interaction --no-progress --no-suggest
112+
- name: "Update dependencies with restricted symfony version"
113+
run: composer update --prefer-stable --no-interaction --no-progress
119114

120115
- name: "Run unit tests with phpunit"
121116
run: vendor/bin/phpunit --configuration=phpunit.xml

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
}
4040
},
4141
"conflict": {
42-
"vimeo/psalm": "~4.2.0"
42+
"vimeo/psalm": "~4.2"
4343
},
4444
"config": {
4545
"sort-packages": true

0 commit comments

Comments
 (0)