From 58cc6fe3e67fce74286162744247575468a6f589 Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Thu, 11 Apr 2024 21:04:45 +0200 Subject: [PATCH 1/5] fix: Correct indentation size violations --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ff4c299..11825c5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,10 +1,10 @@ name: CI on: - push: - branches: [ master ] - pull_request: - branches: [ master ] + push: + branches: [ master ] + pull_request: + branches: [ master ] jobs: test: From 19638a37f60b6feb327d2b7006796fd8598bfad9 Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Thu, 11 Apr 2024 21:05:23 +0200 Subject: [PATCH 2/5] fix: Switch to version 4 of GitHub actions --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 11825c5..6aeb12f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: name: 'PHP 8.2 with lowest stable deps' composer_update_flags: '--prefer-lowest --prefer-stable' steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Setup PHP ${{ matrix.php }} uses: shivammathur/setup-php@v2 @@ -50,7 +50,7 @@ jobs: run: echo "::set-output name=dir::$(composer config cache-files-dir)" - name: Cache dependencies - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ${{ steps.composer-cache.outputs.dir }} key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} @@ -78,6 +78,6 @@ jobs: composer-normalize: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Composer normalize uses: localheinz/composer-normalize-action@0.5.2 From 5271bdf815c5d0c688b22a9006e2f55750cbf6f3 Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Thu, 11 Apr 2024 21:05:53 +0200 Subject: [PATCH 3/5] fix: Replace deprecated set-output --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6aeb12f..441aef8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,7 @@ jobs: - name: Get composer cache directory id: composer-cache - run: echo "::set-output name=dir::$(composer config cache-files-dir)" + run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - name: Cache dependencies uses: actions/cache@v4 From 6b35b2cb6668fff6284d40d335c7d3a70850e473 Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Thu, 11 Apr 2024 21:15:02 +0200 Subject: [PATCH 4/5] fix: Allow enlightn/security-checker ^2.0 for PHP 8.2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 780ca46..cdfd352 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "tijsverkoyen/css-to-inline-styles": "~2.2" }, "require-dev": { - "enlightn/security-checker": "^1.10", + "enlightn/security-checker": "^1.10 || ^2.0", "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5", "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "phpunit/phpunit": "^9.0", From 035670ce5c8722a248833dd36ab2a20abf202dae Mon Sep 17 00:00:00 2001 From: Danny van der Sluijs Date: Thu, 11 Apr 2024 21:19:46 +0200 Subject: [PATCH 5/5] build: Add PHP 8.3 --- .github/workflows/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 441aef8..bfa4029 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,6 +35,13 @@ jobs: allow_fail: false name: 'PHP 8.2 with lowest stable deps' composer_update_flags: '--prefer-lowest --prefer-stable' + - php: 8.3 + allow_fail: false + name: 'PHP 8.3 with latest deps' + - php: 8.3 + allow_fail: false + name: 'PHP 8.3 with lowest stable deps' + composer_update_flags: '--prefer-lowest --prefer-stable' steps: - uses: actions/checkout@v4