Skip to content

Commit

Permalink
Prep for Laravel 11
Browse files Browse the repository at this point in the history
  • Loading branch information
inxilpro committed Mar 12, 2024
1 parent 55c1a24 commit 5141406
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
- name: Install dependencies
env:
COMPOSER_DISCARD_CHANGES: true
run: composer require --no-suggest --no-progress --no-interaction --prefer-dist --update-with-all-dependencies "laravel/framework:^8.0" "orchestra/testbench:^6.0"
run: composer require --no-suggest --no-progress --no-interaction --prefer-dist --update-with-all-dependencies "laravel/framework:^10.0" "orchestra/testbench:^8.0"

- name: Run and publish code coverage
uses: paambaati/codeclimate-action@v2.4.0
uses: paambaati/codeclimate-action@v5.0.0
env:
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Install dependencies
env:
COMPOSER_DISCARD_CHANGES: true
run: composer require --no-suggest --no-progress --no-interaction --prefer-dist --update-with-all-dependencies "laravel/framework:^8.0" "orchestra/testbench:^6.0"
run: composer require --no-suggest --no-progress --no-interaction --prefer-dist --update-with-all-dependencies "laravel/framework:^10.0" "orchestra/testbench:^8.0"

- name: Run PHP CS Fixer
run: ./vendor/bin/php-cs-fixer fix --diff --dry-run
12 changes: 9 additions & 3 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
dependency-version: [ stable, lowest ]
laravel: [ ^8.79, ^9.50.2, 10.* ]
laravel: [ ^8.79, ^9.50.2, 10.*, 11.* ]
php: [ 8.0, 8.1, 8.2 ]
include:
- laravel: ^8.79
Expand All @@ -22,9 +22,15 @@ jobs:
testbench: ^7.22
- laravel: 10.*
testbench: 8.*
- laravel: 11.*
testbench: 9.x-dev
exclude:
- php: 8.2
laravel: ^8.79
- php: 8.1
laravel: 11.*
- php: 8.0
laravel: 11.*
- php: 8.0
laravel: 10.*

Expand Down Expand Up @@ -58,10 +64,10 @@ jobs:
${{ runner.os }}-composer-
- name: Install dependencies
run: composer require --no-interaction --prefer-dist --no-update "illuminate/support:${{ matrix.laravel }}" "illuminate/collections:${{ matrix.laravel }}" "illuminate/console:${{ matrix.laravel }}" "illuminate/http:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}"
run: composer require --no-interaction --prefer-dist --no-update "illuminate/support:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}"

- name: Set dependency version
run: composer update --no-interaction --prefer-dist --with-all-dependencies --prefer-${{ matrix.dependency-version }}

- name: Execute tests
run: vendor/bin/phpunit -v
run: vendor/bin/phpunit
1 change: 1 addition & 0 deletions .idea/blade.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"license": "MIT",
"require": {
"php": ">= 8.0",
"illuminate/support": "^8|^9|^10|11.x-dev|dev-master",
"illuminate/collections": "^8|^9|^10|11.x-dev|dev-master",
"illuminate/console": "^8|^9|^10|11.x-dev|dev-master",
"illuminate/http": "^8|^9|^10|11.x-dev|dev-master",
"illuminate/support": "^8|^9|^10|^11|12.x-dev|dev-master",
"illuminate/collections": "^8|^9|^10|^11|12.x-dev|dev-master",
"illuminate/console": "^8|^9|^10|^11|12.x-dev|dev-master",
"illuminate/http": "^8|^9|^10|^11|12.x-dev|dev-master",
"symfony/console": "^5.4|^6.0",
"ext-json": "*",
"jdorn/sql-formatter": "^1.2",
Expand All @@ -26,10 +26,10 @@
"guzzlehttp/guzzle": "^7.0"
},
"require-dev": {
"orchestra/testbench": "^6.24|^7.10|^8|9.x-dev|10.x-dev|dev-master",
"orchestra/testbench": "^6.24|^7.10|^8|^9|9.x-dev|10.x-dev|dev-master",
"friendsofphp/php-cs-fixer": "^3.0",
"mockery/mockery": "^1.3",
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.5|^10.5",
"glhd/laravel-dumper": "^1.0"
},
"autoload": {
Expand Down

0 comments on commit 5141406

Please sign in to comment.