Drop Laravel 11, add PHP 8.5 and merge CI workflows #22

Merged
mathiaspalmqvist merged 5 commits from laravel-12-13-ci into main 2026-11-12 10:07:42 +00:00
8 changed files with 51 additions and 72 deletions

No files matched your search

@@ -1,52 +1,59 @@
name: run-tests
name: CI
on:
push:
paths:
- '**.php'
- '.github/workflows/run-tests.yml'
- '.gitea/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
run: composer install --prefer-dist --no-interaction --no-progress
- name: Run PHPStan
run: vendor/bin/phpstan --error-format=github
pest:
name: Pest (PHP ${{ matrix.php }}, Laravel ${{ 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
File renamed without changes.
+1 -1
View File
@@ -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
-28
View File
@@ -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
+4 -4
View File
@@ -1,16 +1,16 @@
# 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)
[![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.
## 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
+3 -3
View File
@@ -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": [
{
@@ -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",