From f8a9a4dad46f92b50c5a0b94a833244d3cd28139 Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 18 Feb 2025 17:36:20 +0000 Subject: [PATCH 1/3] Bump dependencies for Laravel 12 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index c430dcc..484656c 100644 --- a/composer.json +++ b/composer.json @@ -20,13 +20,13 @@ "require": { "php": "^7.2.5|^8.0", "guzzlehttp/guzzle": "^7.0", - "illuminate/console": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0", - "illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0" + "illuminate/console": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^5.5|^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0" }, "require-dev": { "mockery/mockery": "^0.9|^1.0", - "orchestra/testbench": "^3.5|^4.0|^5.0|^6.0|^8.0|^9.0", - "phpunit/phpunit": "^7.0|^8.5|^9.3|^10.5" + "orchestra/testbench": "^3.5|^4.0|^5.0|^6.0|^8.0|^9.0|^10.0", + "phpunit/phpunit": "^7.0|^8.5|^9.3|^10.5|^11.5.3" }, "autoload": { "psr-4": { From cc462bd69d2d5288aec7e175102ad0c72ffc3cbc Mon Sep 17 00:00:00 2001 From: Shift Date: Tue, 18 Feb 2025 17:36:20 +0000 Subject: [PATCH 2/3] Update GitHub Actions for Laravel 12 --- .github/workflows/tests-php7.yml | 13 +++++++++++-- .github/workflows/tests-php8.yml | 8 +++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests-php7.yml b/.github/workflows/tests-php7.yml index 9a370a1..ff0d6f2 100644 --- a/.github/workflows/tests-php7.yml +++ b/.github/workflows/tests-php7.yml @@ -11,8 +11,8 @@ jobs: strategy: fail-fast: false matrix: - php: [7.2, 7.3, 7.4] - laravel: ['5.5.*', '5.6.*', '5.7.*', '5.8.*', ^6.0, ^7.0, ^8.0] + php: [7.2, 7.3, 7.4, '8.2', '8.3', '8.4'] + laravel: ['5.5.*', '5.6.*', '5.7.*', '5.8.*', '12.*', ^6.0, ^7.0, ^8.0] include: - laravel: 5.5.* testbench: ^3.5 @@ -35,6 +35,9 @@ jobs: - laravel: ^8.0 testbench: ^6.0 phpunit: 9.3 + - laravel: 12.* + testbench: ^10.0 + phpunit: '8.2' exclude: - laravel: 5.5.* php: 7.4 @@ -46,6 +49,12 @@ jobs: php: 7.4 - laravel: ^8.0 php: 7.2 + - laravel: 12.* + php: 7.2 + - laravel: 12.* + php: 7.3 + - laravel: 12.* + php: 7.4 name: P${{ matrix.php }} - L${{ matrix.laravel }} diff --git a/.github/workflows/tests-php8.yml b/.github/workflows/tests-php8.yml index 61082f3..75d2315 100644 --- a/.github/workflows/tests-php8.yml +++ b/.github/workflows/tests-php8.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: php: [8.0, 8.1, 8.2] - laravel: [^6.0, ^7.0, ^8.0, ^9.0, ^10.0, ^11.0] + laravel: ['12.0', ^6.0, ^7.0, ^8.0, ^9.0, ^10.0, ^11.0] include: - laravel: ^6.0 testbench: ^4.0 @@ -26,6 +26,8 @@ jobs: testbench: ^8.0 - laravel: ^11.0 testbench: ^9.0 + - laravel: '12.0' + testbench: ^10.0 exclude: - laravel: ^6.0 php: 8.1 @@ -43,6 +45,10 @@ jobs: php: 8.0 - laravel: ^11.0 php: 8.1 + - laravel: '12.0' + php: 8.0 + - laravel: '12.0' + php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }} From af78cd54f0f3a873e51a51c36fe569032f0015ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Nikolaou?= Date: Thu, 20 Feb 2025 13:28:22 +0200 Subject: [PATCH 3/3] Update test workflows --- .github/workflows/tests-php7.yml | 15 +++------------ .github/workflows/tests-php8.yml | 26 +++++++++++++++++++++----- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/.github/workflows/tests-php7.yml b/.github/workflows/tests-php7.yml index ff0d6f2..b483b61 100644 --- a/.github/workflows/tests-php7.yml +++ b/.github/workflows/tests-php7.yml @@ -11,8 +11,8 @@ jobs: strategy: fail-fast: false matrix: - php: [7.2, 7.3, 7.4, '8.2', '8.3', '8.4'] - laravel: ['5.5.*', '5.6.*', '5.7.*', '5.8.*', '12.*', ^6.0, ^7.0, ^8.0] + php: [7.2, 7.3, 7.4] + laravel: ["5.5.*", "5.6.*", "5.7.*", "5.8.*", ^6.0, ^7.0, ^8.0] include: - laravel: 5.5.* testbench: ^3.5 @@ -35,9 +35,6 @@ jobs: - laravel: ^8.0 testbench: ^6.0 phpunit: 9.3 - - laravel: 12.* - testbench: ^10.0 - phpunit: '8.2' exclude: - laravel: 5.5.* php: 7.4 @@ -49,12 +46,6 @@ jobs: php: 7.4 - laravel: ^8.0 php: 7.2 - - laravel: 12.* - php: 7.2 - - laravel: 12.* - php: 7.3 - - laravel: 12.* - php: 7.4 name: P${{ matrix.php }} - L${{ matrix.laravel }} @@ -97,7 +88,7 @@ jobs: composer update --prefer-dist --no-interaction --no-progress - name: Setup PCOV - if: '${{ matrix.phpunit < 8 }}' + if: "${{ matrix.phpunit < 8 }}" run: | composer require pcov/clobber vendor/bin/pcov clobber diff --git a/.github/workflows/tests-php8.yml b/.github/workflows/tests-php8.yml index 75d2315..c6a3773 100644 --- a/.github/workflows/tests-php8.yml +++ b/.github/workflows/tests-php8.yml @@ -11,8 +11,8 @@ jobs: strategy: fail-fast: false matrix: - php: [8.0, 8.1, 8.2] - laravel: ['12.0', ^6.0, ^7.0, ^8.0, ^9.0, ^10.0, ^11.0] + php: [8.4, 8.3, 8.2, 8.1, 8.0] + laravel: [^12.0, ^11.0, ^10.0, ^9.0, ^8.0, ^7.0, ^6.0] include: - laravel: ^6.0 testbench: ^4.0 @@ -26,28 +26,44 @@ jobs: testbench: ^8.0 - laravel: ^11.0 testbench: ^9.0 - - laravel: '12.0' + - laravel: "12.0" testbench: ^10.0 exclude: - laravel: ^6.0 php: 8.1 - laravel: ^6.0 php: 8.2 + - laravel: ^6.0 + php: 8.3 + - laravel: ^6.0 + php: 8.4 - laravel: ^7.0 php: 8.1 - laravel: ^7.0 php: 8.2 + - laravel: ^7.0 + php: 8.3 + - laravel: ^7.0 + php: 8.4 - laravel: ^8.0 php: 8.2 + - laravel: ^8.0 + php: 8.3 + - laravel: ^8.0 + php: 8.4 + - laravel: ^9.0 + php: 8.3 + - laravel: ^9.0 + php: 8.4 - laravel: ^10.0 php: 8.0 - laravel: ^11.0 php: 8.0 - laravel: ^11.0 php: 8.1 - - laravel: '12.0' + - laravel: "12.0" php: 8.0 - - laravel: '12.0' + - laravel: "12.0" php: 8.1 name: P${{ matrix.php }} - L${{ matrix.laravel }}