Skip to content

Commit 08c3eea

Browse files
authored
Clean the CI setup (#368)
* Clean the CI setup - Remove jobs allowed to fail for stable PHP versions (keeping only jobs that requires passing, making that the default) - Add CI jobs for PHP 8.2, 8.3 and 8.4 - Add an experimental (i.e. allowed to fail) job for PHP nightly - Remove the `variant` from the matrix as it is always `normal` - Remove the step fetching the composer cache location as this location is never used - Upgrade the `ramsey/composer-install` action to avoid deprecation warnings - Make sure jobs for all PHP versions are run until the end even when one of them fails, to make it easier to determine whether a failure is specific to a version * Fix deprecation for implicit nullable parameters
1 parent d2d5d62 commit 08c3eea

File tree

2 files changed

+8
-27
lines changed

2 files changed

+8
-27
lines changed

.github/workflows/run-tests.yml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,16 @@ jobs:
1919
continue-on-error: ${{ matrix.allowed-to-fail }}
2020

2121
strategy:
22+
fail-fast: false
2223
matrix:
23-
php-version: ['7.4', '8.0', '8.1']
24-
variant: [normal]
24+
php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
2525
dependencies: [highest]
26-
allowed-to-fail: [true]
26+
allowed-to-fail: [false]
2727
symfony-version: [latest]
2828
include:
29-
- php-version: '7.4'
29+
- php-version: nightly
3030
dependencies: highest
31-
variant: normal
32-
allowed-to-fail: false
33-
symfony-version: latest
34-
- php-version: '8.0'
35-
dependencies: highest
36-
variant: normal
37-
allowed-to-fail: false
38-
symfony-version: latest
39-
- php-version: '8.1'
40-
dependencies: highest
41-
variant: normal
42-
allowed-to-fail: false
31+
allowed-to-fail: true
4332
symfony-version: latest
4433
steps:
4534
- name: "Checkout code"
@@ -53,16 +42,8 @@ jobs:
5342
tools: composer:v2
5443
extensions: intl, xdebug
5544

56-
- name: "Set composer cache directory"
57-
id: composer-cache
58-
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
59-
60-
- name: Install variant
61-
if: matrix.variant != 'normal'
62-
run: composer require ${{ matrix.variant }} --no-update
63-
6445
- name: "Install Composer dependencies (${{ matrix.dependencies }})"
65-
uses: "ramsey/composer-install@v1"
46+
uses: "ramsey/composer-install@v3"
6647
with:
6748
dependency-versions: "${{ matrix.dependencies }}"
6849
composer-options: "--prefer-dist"

Dumper/TranslationDumper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@ public function addLoader($id, $loader)
118118
* @param string $target Target directory.
119119
* @param string $pattern route path
120120
* @param string[] $formats Formats to generate.
121-
* @param \stdClass $merge Merge options.
121+
* @param \stdClass|null $merge Merge options.
122122
*/
123123
public function dump(
124124
$target = 'web/js',
125125
$pattern = self::DEFAULT_TRANSLATION_PATTERN,
126126
array $formats = array(),
127-
\stdClass $merge = null
127+
?\stdClass $merge = null
128128
) {
129129
$availableFormats = array('js', 'json');
130130

0 commit comments

Comments
 (0)