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 2847966 commit 842558b
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.2
extensions: dom, curl, libxml, mbstring, zip, pcntl, bcmath, intl, iconv
coverage: pcov

Expand All @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/php-cs-fixer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.4
php-version: 8.2
extensions: dom, curl, libxml, mbstring, zip, pcntl, bcmath, intl, iconv

- name: Cache dependencies
Expand All @@ -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
14 changes: 10 additions & 4 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,24 @@ jobs:
strategy:
matrix:
dependency-version: [ stable, lowest ]
laravel: [ ^8.79, ^9.50.2, 10.* ]
php: [ 8.0, 8.1, 8.2 ]
laravel: [ ^8.79, ^9.50.2, 10.*, 11.* ]
php: [ 8.0, 8.1, 8.2, 8.3 ]
include:
- laravel: ^8.79
testbench: ^6.24
- laravel: ^9.50.2
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 @@ -59,10 +65,10 @@ jobs:
${{ runner.os }}-composer-
- name: Install dependencies
run: composer require --no-interaction --prefer-dist --no-update "illuminate/support:${{ matrix.laravel }}" "illuminate/routing:${{ matrix.laravel }}" "illuminate/view:${{ 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.

7 changes: 4 additions & 3 deletions .idea/gretel.iml

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

3 changes: 3 additions & 0 deletions .idea/php.xml

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

10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
"type": "library",
"license": "MIT",
"require": {
"illuminate/support": "^8|^9|^10|11.x-dev|dev-master",
"illuminate/routing": "^8|^9|^10|11.x-dev|dev-master",
"illuminate/view": "^8|^9|^10|11.x-dev|dev-master",
"illuminate/support": "^8|^9|^10|^11|12.x-dev|dev-master",
"illuminate/routing": "^8|^9|^10|^11|12.x-dev|dev-master",
"illuminate/view": "^8|^9|^10|^11|12.x-dev|dev-master",
"laravel/serializable-closure": "^1.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"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 842558b

Please sign in to comment.