Skip to content

Commit c65eb01

Browse files
authored
Merge pull request #1815 from franmomu/fix_tests
Fix tests for symfony 5.3
2 parents 6ce5dd6 + 19b0339 commit c65eb01

File tree

3 files changed

+17
-22
lines changed

3 files changed

+17
-22
lines changed

.github/workflows/continuous-integration.yaml

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,27 @@ jobs:
3232
runs-on: 'ubuntu-20.04'
3333
name: 'PHPUnit (PHP ${{ matrix.php }}, ES ${{ matrix.elasticsearch }})'
3434
timeout-minutes: 10
35+
env:
36+
SYMFONY_REQUIRE: "${{ matrix.symfony_require }}"
3537
strategy:
3638
matrix:
3739
include:
3840
- php: '7.2'
3941
elasticsearch: '7.0.0'
40-
composer_flags: '--prefer-lowest --prefer-stable'
42+
dependencies: 'lowest'
4143
symfony_require: '4.4.*'
4244
- php: '7.3'
4345
elasticsearch: '7.4.0'
44-
composer_flags: '--prefer-stable'
46+
dependencies: 'highest'
47+
symfony_require: '5.3.*'
4548
- php: '7.4'
4649
elasticsearch: '7.9.0'
47-
composer_flags: '--prefer-stable'
50+
dependencies: 'highest'
51+
symfony_require: '5.3.*'
4852
- php: '8.0'
4953
elasticsearch: '7.11.0'
50-
composer_flags: '--prefer-stable'
54+
dependencies: 'highest'
55+
symfony_require: '5.3.*'
5156
fail-fast: false
5257
steps:
5358
- name: 'Checkout'
@@ -61,26 +66,14 @@ jobs:
6166
tools: 'pecl, composer:v2'
6267
extensions: 'curl, json, mbstring, mongodb-1.9.0, openssl'
6368

64-
- name: 'Get composer cache directory'
65-
id: 'composer_cache'
66-
run: |
67-
echo "::set-output name=dir::$(composer config cache-files-dir)"
69+
- name: "Globally install symfony/flex"
70+
run: "composer global require --no-progress --no-scripts --no-plugins symfony/flex"
6871

69-
- name: 'Cache dependencies'
70-
uses: 'actions/cache@v2'
72+
- name: "Install Composer dependencies (${{ matrix.dependencies }})"
73+
uses: "ramsey/composer-install@v1"
7174
with:
72-
path: '${{ steps.composer_cache.outputs.dir }}'
73-
key: '${{ runner.os }}-composer-php${{ matrix.php }}-${{ hashFiles(''**/composer.json'') }}'
74-
restore-keys: |
75-
${{ runner.os }}-composer-php${{ matrix.php }}-
76-
${{ runner.os }}-composer-
77-
78-
- name: 'Update dependencies'
79-
env:
80-
SYMFONY_REQUIRE: "${{ matrix.symfony_require }}"
81-
run: |
82-
composer global require --no-progress --no-scripts --no-plugins symfony/flex
83-
composer update --prefer-dist --no-interaction --no-progress --ansi ${{ matrix.composer_flags }}
75+
dependency-versions: "${{ matrix.dependencies }}"
76+
composer-options: "--prefer-dist --prefer-stable"
8477

8578
- name: 'Setup Elasticsearch'
8679
run: |

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ composer.lock
44
composer.phar
55
.php-cs-fixer.php
66
.php-cs-fixer.cache
7+
.phpunit.result.cache

tests/Functional/app/config/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
framework:
22
test: true
33
secret: secret
4+
annotations: ~
45

56
services:
67
logger: { class: Psr\Log\NullLogger }

0 commit comments

Comments
 (0)