From 329436c752f3dafd1acd6749db28d4fc35c59444 Mon Sep 17 00:00:00 2001 From: Cesar Date: Thu, 7 Mar 2024 16:15:48 +0100 Subject: [PATCH 1/3] Add supprot to laravel 11 --- .github/workflows/tests.yml | 27 ++++++++++++++++++++++----- composer.json | 4 ++-- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2ec38ad..74c4229 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,7 +13,25 @@ jobs: strategy: matrix: - php-versions: ['8.3', '8.2', '8.1', '8.0'] + php: ['8.3', '8.2', '8.1', '8.0'] + laravel: ['9.*', '10.*', '11.*'] + dependency-version: [prefer-stable] + include: + - laravel: 9.* + testbench: 7.* + - laravel: 10.* + testbench: 8.* + - laravel: 11.* + testbench: 9.* + exclude: + - laravel: 10.* + php: 8.0 + - laravel: 11.* + php: 8.1 + - laravel: 11.* + php: 8.0 + + name: P${{ matrix.php }} - L${{ matrix.laravel }} steps: - uses: actions/checkout@v2 @@ -21,18 +39,17 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: ${{ matrix.php-versions }} + php-version: ${{ matrix.php }} extensions: dom, curl, libxml, mbstring, zip, pcntl, bcmath, intl, exif coverage: xdebug - - name: Validate composer.json and composer.lock run: composer validate - name: Install dependencies run: | - composer install - composer dump + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Run test phpunit run: vendor/bin/phpunit \ No newline at end of file diff --git a/composer.json b/composer.json index bb1fc17..86f700e 100644 --- a/composer.json +++ b/composer.json @@ -26,13 +26,13 @@ "guzzlehttp/guzzle": "^7.4", "league/omnipay": "^3.2", "omnipay/common": "^3.2", - "illuminate/contracts": "^9.25|^10.0" + "illuminate/contracts": "^9.25|^10.0|^11.0" }, "require-dev": { "guzzlehttp/psr7": "^1", "omnipay/tests": "^4.1", "phpunit/phpunit": "^9.5", - "orchestra/testbench": "^7.0|^8.0", + "orchestra/testbench": "^7.0|^8.0|^9.0", "friendsofphp/php-cs-fixer": "^3.10", "phpstan/phpstan": "^1.8", "nunomaduro/larastan": "^2.1" From 350cc8e2f23f06a8442232603fd88be6a54e4918 Mon Sep 17 00:00:00 2001 From: Cesar Date: Thu, 7 Mar 2024 16:18:58 +0100 Subject: [PATCH 2/3] update pphunit --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 86f700e..f49a811 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "require-dev": { "guzzlehttp/psr7": "^1", "omnipay/tests": "^4.1", - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.5|^10.0", "orchestra/testbench": "^7.0|^8.0|^9.0", "friendsofphp/php-cs-fixer": "^3.10", "phpstan/phpstan": "^1.8", From 74cc0e0f00a0706d009bfc50abf99eb2d8cb63b5 Mon Sep 17 00:00:00 2001 From: Cesar Date: Thu, 7 Mar 2024 16:22:21 +0100 Subject: [PATCH 3/3] update pphunit --- .github/workflows/tests.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 74c4229..3371651 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,22 +14,18 @@ jobs: strategy: matrix: php: ['8.3', '8.2', '8.1', '8.0'] - laravel: ['9.*', '10.*', '11.*'] + laravel: ['9.*', '10.*'] dependency-version: [prefer-stable] include: - laravel: 9.* testbench: 7.* - laravel: 10.* testbench: 8.* - - laravel: 11.* - testbench: 9.* exclude: - laravel: 10.* php: 8.0 - laravel: 11.* php: 8.1 - - laravel: 11.* - php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }}