From e3a0aa54e94d6f48b54b3546847cf2a6c25a8d24 Mon Sep 17 00:00:00 2001 From: Mathias Palmqvist Date: Thu, 12 Nov 2026 10:23:16 +0100 Subject: [PATCH 1/5] Drop Laravel 11, add PHP 8.5 and merge CI workflows - Require Laravel 12 or 13 and drop orchestra/testbench 9 - Add PHP 8.5 to the test matrix - Merge the test and PHPStan workflows into a single CI workflow, running PHPStan before the test matrix - Add manual dispatch and cancel superseded runs - Update requirements and badge in README --- .github/workflows/{run-tests.yml => ci.yml} | 79 +++++++++++---------- .github/workflows/phpstan.yml | 28 -------- README.md | 6 +- composer.json | 4 +- 4 files changed, 48 insertions(+), 69 deletions(-) rename .github/workflows/{run-tests.yml => ci.yml} (54%) delete mode 100644 .github/workflows/phpstan.yml diff --git a/.github/workflows/run-tests.yml b/.github/workflows/ci.yml similarity index 54% rename from .github/workflows/run-tests.yml rename to .github/workflows/ci.yml index d7a2062..598363c 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/ci.yml @@ -1,52 +1,59 @@ -name: run-tests +name: CI on: push: paths: - '**.php' - - '.github/workflows/run-tests.yml' + - '.github/workflows/ci.yml' - 'phpunit.xml.dist' + - 'phpstan.neon.dist' + - 'phpstan-baseline.neon' - 'composer.json' - 'composer.lock' + workflow_dispatch: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: - test: - runs-on: ${{ matrix.os }} + phpstan: + name: PHPStan + runs-on: ubuntu-latest + timeout-minutes: 5 + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '8.5' + coverage: none + + - name: Install composer dependencies + uses: ramsey/composer-install@v3 + + - name: Run PHPStan + run: vendor/bin/phpstan --error-format=github + + tests: + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} + needs: phpstan + runs-on: ubuntu-latest timeout-minutes: 5 strategy: fail-fast: true matrix: - os: [ubuntu-latest] - php: [8.3, 8.4] - laravel: [11.*, 12.*, 13.*] + php: ['8.3', '8.4', '8.5'] + laravel: ['12.*', '13.*'] stability: [prefer-lowest, prefer-stable] include: - - laravel: 11.* - php: 8.3 - testbench: 9.* - carbon: ^2.63 - - laravel: 11.* - php: 8.4 - testbench: 9.* - carbon: ^2.63 - - laravel: 12.* - php: 8.3 - testbench: 10.* - carbon: ^3.8.4 - - laravel: 12.* - php: 8.4 - testbench: 10.* - carbon: ^3.8.4 - - laravel: 13.* - php: 8.3 - testbench: 11.* - carbon: ^3.8.4 - - laravel: 13.* - php: 8.4 - testbench: 11.* - carbon: ^3.8.4 - - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }} + - laravel: '12.*' + testbench: '10.*' + - laravel: '13.*' + testbench: '11.*' steps: - name: Checkout code @@ -69,12 +76,12 @@ jobs: composer require \ "laravel/framework:${{ matrix.laravel }}" \ "orchestra/testbench:${{ matrix.testbench }}" \ - "nesbot/carbon:${{ matrix.carbon }}" \ - --no-interaction --no-update + "nesbot/carbon:^3.8.4" \ + --dev --no-interaction --no-update composer update --${{ matrix.stability }} --prefer-dist --no-interaction - - name: List Installed Dependencies + - name: List installed dependencies run: composer show -D - name: Execute tests diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml deleted file mode 100644 index 43a82b4..0000000 --- a/.github/workflows/phpstan.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: PHPStan - -on: - push: - paths: - - '**.php' - - 'phpstan.neon.dist' - - '.github/workflows/phpstan.yml' - -jobs: - phpstan: - name: phpstan - runs-on: ubuntu-latest - timeout-minutes: 5 - steps: - - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: '8.4' - coverage: none - - - name: Install composer dependencies - uses: ramsey/composer-install@v3 - - - name: Run PHPStan - run: ./vendor/bin/phpstan --error-format=github diff --git a/README.md b/README.md index 308fe9b..993c98e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # laravel-plausible-proxy [![Latest Version on Packagist](https://img.shields.io/packagist/v/mattitja/laravel-plausible-proxy.svg?style=flat-square)](https://packagist.org/packages/mattitja/laravel-plausible-proxy) -[![Tests](https://git.mattitja.se/Github/laravel-plausible-proxy/actions/workflows/run-tests.yml/badge.svg?branch=main)](https://git.mattitja.se/Github/laravel-plausible-proxy/actions?workflow=run-tests.yml) +[![Tests](https://git.mattitja.se/Github/laravel-plausible-proxy/actions/workflows/ci.yml/badge.svg?branch=main)](https://git.mattitja.se/Github/laravel-plausible-proxy/actions?workflow=ci.yml) [![Code Style](https://git.mattitja.se/Github/laravel-plausible-proxy/actions/workflows/fix-php-code-style-issues.yml/badge.svg?branch=main)](https://git.mattitja.se/Github/laravel-plausible-proxy/actions?workflow=fix-php-code-style-issues.yml) [![Total Downloads](https://img.shields.io/packagist/dt/mattitja/laravel-plausible-proxy.svg?style=flat-square)](https://packagist.org/packages/mattitja/laravel-plausible-proxy) @@ -9,8 +9,8 @@ A Laravel package for proxying Plausible Analytics, improving performance and pr ## Requirements -- Laravel 11, 12 or 13 -- PHP 8.3 or 8.4 +- Laravel 12 or 13 +- PHP 8.3, 8.4 or 8.5 ## Installation diff --git a/composer.json b/composer.json index f104105..dc9d228 100644 --- a/composer.json +++ b/composer.json @@ -19,13 +19,13 @@ "require": { "php": "^8.3", "spatie/laravel-package-tools": "^1.16", - "illuminate/contracts": "^11.0||^12.0||^13.0" + "illuminate/contracts": "^12.0||^13.0" }, "require-dev": { "laravel/pint": "^1.14", "nunomaduro/collision": "^8.1", "larastan/larastan": "^3.0", - "orchestra/testbench": "^9.0||^10.0||^11.0", + "orchestra/testbench": "^10.0||^11.0", "pestphp/pest": "^3.0||^4.0", "pestphp/pest-plugin-arch": "^3.0||^4.0", "pestphp/pest-plugin-laravel": "^3.0||^4.0", -- 2.53.0 From ded89675517459329fe174b437ac0a521e074a3c Mon Sep 17 00:00:00 2001 From: Mathias Palmqvist Date: Thu, 12 Nov 2026 10:27:28 +0100 Subject: [PATCH 2/5] Point repository links at the new 559342-9607 owner --- .github/ISSUE_TEMPLATE/config.yml | 2 +- README.md | 4 ++-- composer.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index c6beab5..c216b14 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Ask a question or request a feature - url: https://git.mattitja.se/Github/laravel-plausible-proxy/issues + url: https://git.mattitja.se/559342-9607/laravel-plausible-proxy/issues about: Open an issue in the repository - name: Report a security issue url: mailto:hej@mattitja.se diff --git a/README.md b/README.md index 993c98e..e261f86 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # laravel-plausible-proxy [![Latest Version on Packagist](https://img.shields.io/packagist/v/mattitja/laravel-plausible-proxy.svg?style=flat-square)](https://packagist.org/packages/mattitja/laravel-plausible-proxy) -[![Tests](https://git.mattitja.se/Github/laravel-plausible-proxy/actions/workflows/ci.yml/badge.svg?branch=main)](https://git.mattitja.se/Github/laravel-plausible-proxy/actions?workflow=ci.yml) -[![Code Style](https://git.mattitja.se/Github/laravel-plausible-proxy/actions/workflows/fix-php-code-style-issues.yml/badge.svg?branch=main)](https://git.mattitja.se/Github/laravel-plausible-proxy/actions?workflow=fix-php-code-style-issues.yml) +[![Tests](https://git.mattitja.se/559342-9607/laravel-plausible-proxy/actions/workflows/ci.yml/badge.svg?branch=main)](https://git.mattitja.se/559342-9607/laravel-plausible-proxy/actions?workflow=ci.yml) +[![Code Style](https://git.mattitja.se/559342-9607/laravel-plausible-proxy/actions/workflows/fix-php-code-style-issues.yml/badge.svg?branch=main)](https://git.mattitja.se/559342-9607/laravel-plausible-proxy/actions?workflow=fix-php-code-style-issues.yml) [![Total Downloads](https://img.shields.io/packagist/dt/mattitja/laravel-plausible-proxy.svg?style=flat-square)](https://packagist.org/packages/mattitja/laravel-plausible-proxy) A Laravel package for proxying Plausible Analytics, improving performance and privacy. diff --git a/composer.json b/composer.json index dc9d228..9e032b2 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "laravel-plausible-proxy", "plausible" ], - "homepage": "https://git.mattitja.se/Github/laravel-plausible-proxy", + "homepage": "https://git.mattitja.se/559342-9607/laravel-plausible-proxy", "license": "MIT", "authors": [ { -- 2.53.0 From 6d9206df805944e12f8752d7aba8887d5befd749 Mon Sep 17 00:00:00 2001 From: Mathias Palmqvist Date: Thu, 12 Nov 2026 10:38:14 +0100 Subject: [PATCH 3/5] Install PHPStan dependencies without the Composer cache action The runner cannot reach the Actions cache service, so every restore and save timed out without ever producing a cache hit. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 598363c..8ca18ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: coverage: none - name: Install composer dependencies - uses: ramsey/composer-install@v3 + run: composer install --prefer-dist --no-interaction --no-progress - name: Run PHPStan run: vendor/bin/phpstan --error-format=github -- 2.53.0 From 7af348cbb4e80f08ab9ee199e40f95891e61a362 Mon Sep 17 00:00:00 2001 From: Mathias Palmqvist Date: Thu, 12 Nov 2026 10:39:56 +0100 Subject: [PATCH 4/5] Name the test matrix jobs Pest --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ca18ef..860a5c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,8 +38,8 @@ jobs: - name: Run PHPStan run: vendor/bin/phpstan --error-format=github - tests: - name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} + pest: + name: Pest (PHP ${{ matrix.php }}, Laravel ${{ matrix.laravel }}, ${{ matrix.stability }}) needs: phpstan runs-on: ubuntu-latest timeout-minutes: 5 -- 2.53.0 From d42263023f10f5fa66bc4f014969e56f77f89754 Mon Sep 17 00:00:00 2001 From: Mathias Palmqvist Date: Thu, 12 Nov 2026 10:51:27 +0100 Subject: [PATCH 5/5] Move workflows to .gitea/workflows --- {.github => .gitea}/workflows/ci.yml | 2 +- {.github => .gitea}/workflows/dependabot-auto-merge.yml | 0 {.github => .gitea}/workflows/fix-php-code-style-issues.yml | 0 {.github => .gitea}/workflows/update-changelog.yml | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename {.github => .gitea}/workflows/ci.yml (98%) rename {.github => .gitea}/workflows/dependabot-auto-merge.yml (100%) rename {.github => .gitea}/workflows/fix-php-code-style-issues.yml (100%) rename {.github => .gitea}/workflows/update-changelog.yml (100%) diff --git a/.github/workflows/ci.yml b/.gitea/workflows/ci.yml similarity index 98% rename from .github/workflows/ci.yml rename to .gitea/workflows/ci.yml index 860a5c0..835fb1b 100644 --- a/.github/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: paths: - '**.php' - - '.github/workflows/ci.yml' + - '.gitea/workflows/ci.yml' - 'phpunit.xml.dist' - 'phpstan.neon.dist' - 'phpstan-baseline.neon' diff --git a/.github/workflows/dependabot-auto-merge.yml b/.gitea/workflows/dependabot-auto-merge.yml similarity index 100% rename from .github/workflows/dependabot-auto-merge.yml rename to .gitea/workflows/dependabot-auto-merge.yml diff --git a/.github/workflows/fix-php-code-style-issues.yml b/.gitea/workflows/fix-php-code-style-issues.yml similarity index 100% rename from .github/workflows/fix-php-code-style-issues.yml rename to .gitea/workflows/fix-php-code-style-issues.yml diff --git a/.github/workflows/update-changelog.yml b/.gitea/workflows/update-changelog.yml similarity index 100% rename from .github/workflows/update-changelog.yml rename to .gitea/workflows/update-changelog.yml -- 2.53.0