Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 6 additions & 25 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,16 @@ jobs:
continue-on-error: ${{ matrix.allowed-to-fail }}

strategy:
fail-fast: false
matrix:
php-version: ['7.4', '8.0', '8.1']
variant: [normal]
php-version: ['7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
dependencies: [highest]
allowed-to-fail: [true]
allowed-to-fail: [false]
symfony-version: [latest]
include:
- php-version: '7.4'
- php-version: nightly
dependencies: highest
variant: normal
allowed-to-fail: false
symfony-version: latest
- php-version: '8.0'
dependencies: highest
variant: normal
allowed-to-fail: false
symfony-version: latest
- php-version: '8.1'
dependencies: highest
variant: normal
allowed-to-fail: false
allowed-to-fail: true
symfony-version: latest
steps:
- name: "Checkout code"
Expand All @@ -53,16 +42,8 @@ jobs:
tools: composer:v2
extensions: intl, xdebug

- name: "Set composer cache directory"
id: composer-cache
run: echo "::set-output name=dir::$(composer config cache-files-dir)"

- name: Install variant
if: matrix.variant != 'normal'
run: composer require ${{ matrix.variant }} --no-update

- name: "Install Composer dependencies (${{ matrix.dependencies }})"
uses: "ramsey/composer-install@v1"
uses: "ramsey/composer-install@v3"
with:
dependency-versions: "${{ matrix.dependencies }}"
composer-options: "--prefer-dist"
Expand Down
4 changes: 2 additions & 2 deletions Dumper/TranslationDumper.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ public function addLoader($id, $loader)
* @param string $target Target directory.
* @param string $pattern route path
* @param string[] $formats Formats to generate.
* @param \stdClass $merge Merge options.
* @param \stdClass|null $merge Merge options.
*/
public function dump(
$target = 'web/js',
$pattern = self::DEFAULT_TRANSLATION_PATTERN,
array $formats = array(),
\stdClass $merge = null
?\stdClass $merge = null
) {
$availableFormats = array('js', 'json');

Expand Down