From 5133f42ac9c64c99d1e1090703964cb3e32eb87a Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Sun, 17 Mar 2024 00:32:02 +0700 Subject: [PATCH 1/5] Laravel 11.x Support --- .github/workflows/setup_test.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/setup_test.yml b/.github/workflows/setup_test.yml index 8ee2ca9..8443d15 100644 --- a/.github/workflows/setup_test.yml +++ b/.github/workflows/setup_test.yml @@ -10,10 +10,19 @@ jobs: matrix: os: [ ubuntu-latest ] php: [ '8.1', '8.2', '8.3' ] - laravel: [ 10.*, 9.* ] + laravel: [ 11.*, 10.*, 9.* ] include: + - laravel: 11.* + testbench: 9.* - laravel: 10.* testbench: 8.* + exclude: + - laravel: 11.* + php: 8.1 + - laravel: 11.* + php: 8.0 + - laravel: 10.* + php: 8.0 steps: - name: Setup PHP uses: shivammathur/setup-php@v2 From d70d57d4398716b04dfd5e1152e4064fa5aeb743 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Sun, 17 Mar 2024 00:41:33 +0700 Subject: [PATCH 2/5] Laravel 11.x Support - remove redundant exclude --- .github/workflows/setup_test.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/setup_test.yml b/.github/workflows/setup_test.yml index 8443d15..ee21fee 100644 --- a/.github/workflows/setup_test.yml +++ b/.github/workflows/setup_test.yml @@ -19,10 +19,6 @@ jobs: exclude: - laravel: 11.* php: 8.1 - - laravel: 11.* - php: 8.0 - - laravel: 10.* - php: 8.0 steps: - name: Setup PHP uses: shivammathur/setup-php@v2 From d20667167de7721a5f8959ac176602e4febe1044 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Sun, 17 Mar 2024 00:47:49 +0700 Subject: [PATCH 3/5] Bump shivammathur/setup-php update --- .github/workflows/phpstan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index de07f19..114a07c 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -10,9 +10,9 @@ jobs: - uses: actions/checkout@v4 - name: Setup PHP - uses: shivammathur/setup-php@2.26.0 + uses: shivammathur/setup-php@v2 with: - php-version: '8.1' + php: [ '8.1', '8.2', '8.3' ] - name: Checkout code uses: actions/checkout@v4 From 5b92688f9d646c0d3446e4799889a1d2ba5f0e1d Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Sun, 17 Mar 2024 01:05:10 +0700 Subject: [PATCH 4/5] Laravel 11.x Support --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index c12583a..6bcaadb 100644 --- a/composer.json +++ b/composer.json @@ -42,13 +42,13 @@ "php": "^8.1", "eleirbag89/telegrambotphp": "^1.4", "guzzlehttp/guzzle": "^7.8", - "symfony/http-foundation": "^6.3", - "vlucas/phpdotenv": "^5.5" + "symfony/http-foundation": "^6.4", + "vlucas/phpdotenv": "^5.6" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^v3.37.1", + "friendsofphp/php-cs-fixer": "^v3.0", "pestphp/pest": "^2.24", - "phpstan/phpstan": "^1.10.39" + "phpstan/phpstan": "^1.0" }, "scripts": { "analyse": "vendor/bin/phpstan", From 4252e923da33cd1413ebe2f03324d864b6e05298 Mon Sep 17 00:00:00 2001 From: Tan Nguyen Date: Sun, 17 Mar 2024 01:10:07 +0700 Subject: [PATCH 5/5] fix phpstan workflow for multiple php version --- .github/workflows/phpstan.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 114a07c..657e4cc 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -4,7 +4,13 @@ on: [push, pull_request] jobs: phpstan: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + name: PHPStan - P${{ matrix.php }} + + strategy: + matrix: + os: [ ubuntu-latest ] + php: [ '8.1', '8.2', '8.3' ] steps: - uses: actions/checkout@v4 @@ -12,7 +18,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php: [ '8.1', '8.2', '8.3' ] + php-version: ${{ matrix.php }} - name: Checkout code uses: actions/checkout@v4