From c7386d94ad45714dff1e36f4f8f1e4f117bc30eb Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 23 Sep 2024 09:46:17 +0100 Subject: [PATCH 1/2] Run CI on PHP 8.3 and 8.4 --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ad3f5c4..8ec7054 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,11 +12,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2'] + php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -36,11 +36,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - php: ['7.1', '7.4', '8.0', '8.1', '8.2'] + php: ['7.1', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4'] steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -63,7 +63,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 From b3a5380ccb1b661585bc9518858baacc1c1488e3 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Mon, 23 Sep 2024 09:56:16 +0100 Subject: [PATCH 2/2] Fixes --- .github/workflows/ci.yml | 10 +++++++++- .php-cs-fixer.dist.php | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ec7054..b38e843 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,6 +25,10 @@ jobs: tools: composer:v2 coverage: none + - name: Emulate PHP 8.3 + run: composer config platform.php 8.3.999 + if: matrix.php == '8.4' + - name: Install dependencies run: composer update --prefer-dist --no-interaction --no-progress @@ -49,6 +53,10 @@ jobs: tools: composer:v2 coverage: none + - name: Emulate PHP 8.3 + run: composer config platform.php 8.3.999 + if: matrix.php == '8.4' + - name: Install dependencies run: | composer require "sebastian/comparator:^3.0.2" --no-interaction --no-update @@ -68,7 +76,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 7.4 + php-version: '7.4' tools: composer:v2 coverage: xdebug diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 83809c2..eead1b7 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -9,6 +9,7 @@ ->setRiskyAllowed(true) ->setRules([ '@Symfony' => true, + 'trailing_comma_in_multiline' => false, ]) ->setFinder($finder) ;