Skip to content
This repository has been archived by the owner on Nov 16, 2023. It is now read-only.

Commit

Permalink
Laravel 10 support (#24)
Browse files Browse the repository at this point in the history
* Added Laravel 10 support
* Dropped Laravel 8 support
* Locked PHP versions to 8.1 and 8.2
  • Loading branch information
Okipa committed Jan 23, 2023
1 parent 2f12aa9 commit 4a5e0e6
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 24 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,13 @@ jobs:
strategy:
fail-fast: true
matrix:
php: ['8.2', '8.1']
laravel: ['9.*', '8.*']
php: ['8.1', '8.2']
laravel: ['9.*', '10.*']
include:
- laravel: '9.*'
testbench: '7.*'
eloquent-sortable: '4.*'
larastan: '2.*'
- laravel: '8.*'
eloquent-sortable: '3.*'
testbench: '6.*'
larastan: '1.*'
- laravel: '10.*'
testbench: '8.*'

name: P${{ matrix.php }} - L${{ matrix.laravel }}

Expand Down Expand Up @@ -53,13 +49,13 @@ jobs:
# Lower PHP and laravel versions.

- name: PHPUnit without code coverage
if: matrix.php != '8.2' || matrix.laravel != '9.*'
if: matrix.php != '8.2' || matrix.laravel != '10.*'
run: vendor/bin/testbench package:test --parallel --no-coverage

# Last PHP and laravel versions.

- name: Code analysis
if: matrix.php == '8.2' && matrix.laravel == '9.*'
if: matrix.php == '8.2' && matrix.laravel == '10.*'
run: |
# Remove this line once Larastan and Livewire are working well together
sed -i -e 's#.*protected \$enablesPackageDiscoveries.*#&\nprotected function overrideApplicationBindings($app){return["brickables"=>"Okipa\\\\LaravelBrickables\\\\Brickables"];}#' vendor/nunomaduro/larastan/src/ApplicationResolver.php
Expand All @@ -68,13 +64,13 @@ jobs:
vendor/bin/phpstan analyse
- name: PHPUnit with code coverage
if: matrix.php == '8.2' && matrix.laravel == '9.*'
if: matrix.php == '8.2' && matrix.laravel == '10.*'
run: |
mkdir -p build/logs
vendor/bin/testbench package:test --parallel --coverage-text --coverage-clover build/logs/clover.xml
- name: Code coverage upload to Coveralls
if: env.COVERALLS_REPO_TOKEN && matrix.php == '8.2' && matrix.laravel == '9.*'
if: env.COVERALLS_REPO_TOKEN && matrix.php == '8.2' && matrix.laravel == '10.*'
env:
COVERALLS_RUN_LOCALLY: 1
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [3.2.0](https://github.com/Okipa/laravel-brickables/compare/3.1.0...3.2.0)

2023-01-22

* Added Laravel 10 support
* Dropped Laravel 8 support
* Locked PHP versions to 8.1 and 8.2

## [3.1.0](https://github.com/Okipa/laravel-brickables/compare/3.0.1...3.1.0)

2022-12-23
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,13 @@ Found this package helpful? Please consider supporting my work!

## Compatibility

| Laravel version | PHP version | Package version |
|---|---|---|
| ^8.0 | ^9.0 | ^8.1 | ^8.2 | ^3.1 |
| ^8.0 | ^9.0 | ^8.0 | ^8.1 | ^3.0 |
| ^7.0 | ^8.0 | ^7.4 | ^8.0 | ^2.0 |
| ^5.8 | ^6.0 | ^7.0 | ^7.1 | ^7.2 | ^7.3 | ^7.4 | ^1.0 |
| Laravel version | PHP version | Package version |
|------------------------------|------------------------------------------|-----------------|
| ^9.0 | ^10.0 | 8.1.* | 8.2.* | ^3.2 |
| ^8.0 | ^9.0 | ^8.1 | ^8.2 | ^3.1 |
| ^8.0 | ^9.0 | ^8.0 | ^8.1 | ^3.0 |
| ^7.0 | ^8.0 | ^7.4 | ^8.0 | ^2.0 |
| ^5.8 | ^6.0 | ^7.0 | ^7.1 | ^7.2 | ^7.3 | ^7.4 | ^1.0 |

## Upgrade guide

Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
}
],
"require": {
"php": "^8.1|^8.2",
"illuminate/contracts": "^8.0|^9.0",
"spatie/eloquent-sortable": "^3.10.0|^4.0.1"
"php": "8.1.*|8.2.*",
"illuminate/contracts": "^9.0|^10.0",
"spatie/eloquent-sortable": "4.0.2"
},
"require-dev": {
"brianium/paratest": "^6.4",
"nunomaduro/collision": "^5.10|^6.0",
"nunomaduro/larastan": "^1.0|^2.0",
"orchestra/testbench": "^6.0|^7.0",
"nunomaduro/collision": "^6.0",
"nunomaduro/larastan": "^2.0",
"orchestra/testbench": "^7.0|^8.0",
"phpmd/phpmd": "^2.11",
"laravel/pint": "^1.1"
},
Expand Down

0 comments on commit 4a5e0e6

Please sign in to comment.