diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 30864e3..dfb0cf3 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -16,19 +16,23 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, windows-latest] - php: [8.4, 8.3, 8.2, 8.1] - laravel: ['10.*', '11.*'] + php: [8.1, 8.2, 8.3, 8.4] + laravel: ['10.*', '11.*', '12.*'] dependency-version: [prefer-stable] include: - laravel: 10.* testbench: 8.* - laravel: 11.* testbench: 9.* + - laravel: 12.* + testbench: 10.* exclude: - - laravel: 11.* - php: 8.1 - laravel: 10.* php: 8.4 + - laravel: 11.* + php: 8.1 + - laravel: 12.* + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }} @@ -50,7 +54,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer require "illuminate/contracts:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Execute tests diff --git a/CHANGELOG.md b/CHANGELOG.md index fda7212..3ee4c3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes will be documented in this file +## 1.4.0 - 2025-02-17 + +- Add Laravel 12 support + ## 1.3.0 - 2024-12-04 - Add PHP 8.4 support diff --git a/README.md b/README.md index 32431d6..8711937 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Create request Correlation-IDs via middleware and pass both this globally unique `Correlation-ID` and any user provided `Request-ID` to the global log context. -| Version | Laravel | PHP | -|---------|--------------|----------------------------------| -| 1.* | 10.* \| 11.* | 8.1.* \| 8.2.* \| 8.3.* \| 8.4.* | +| Version | Laravel | PHP | +|---------|----------------------|----------------------------------| +| 1.* | 10.* \| 11.* \| 12.* | 8.1.* \| 8.2.* \| 8.3.* \| 8.4.* | ## Motivation diff --git a/composer.json b/composer.json index 49465d8..f62d49a 100644 --- a/composer.json +++ b/composer.json @@ -22,12 +22,12 @@ ], "require": { "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", - "illuminate/contracts": "^10.0 || ^11.0" + "illuminate/contracts": "^10.0 || ^11.0 || ^12.0" }, "require-dev": { "nunomaduro/collision": "^7.8 || ^8.0", - "orchestra/testbench": "^8.0 || ^9.0", - "phpunit/phpunit": "^10.0" + "orchestra/testbench": "^8.0 || ^9.0 || ^10.0", + "phpunit/phpunit": "^10.0 || ^11.0" }, "autoload": { "psr-4": {