Skip to content

Commit

Permalink
Merge pull request #19 from clickbar/laravel-10-php82
Browse files Browse the repository at this point in the history
  • Loading branch information
saibotk authored Feb 7, 2023
2 parents 2238450 + d34096e commit 99132e1
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/fix-styling.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: 8.1
php-version: 8.2
tools: composer:v2
coverage: none

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/phpstan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: 8.2
tools: composer:v2
coverage: none

- name: Install composer dependencies
uses: ramsey/composer-install@v2
run: composer install -n --prefer-dist

- name: Run PHPStan
run: ./vendor/bin/phpstan --error-format=github
8 changes: 5 additions & 3 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest, windows-latest]
php: [8.1]
laravel: [9.*]
php: [8.2, 8.1]
laravel: [9.*, 10.*]
stability: [prefer-lowest, prefer-stable]
include:
- laravel: 10.*
testbench: 8.*
- laravel: 9.*
testbench: 7.*

Expand All @@ -40,7 +42,7 @@ jobs:
- name: Install dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:>=2.62.1" --no-interaction --no-update
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
- name: Execute tests
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

### Added
- Laravel 10 support
- PHP 8.2 support

## [1.0.2](https://github.com/clickbar/laravel-magellan/tree/1.0.2) - 2023-01-05

### Fixed
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
],
"require": {
"php": "^8.1",
"illuminate/console": "^9.0",
"illuminate/contracts": "^9.28",
"illuminate/database": "^9.0",
"illuminate/support": "^9.0",
"illuminate/console": "^9.0|^10.0",
"illuminate/contracts": "^9.28|^10.0",
"illuminate/database": "^9.0|^10.0",
"illuminate/support": "^9.0|^10.0",
"spatie/invade": "^1.1",
"spatie/laravel-package-tools": "^1.9.2"
"spatie/laravel-package-tools": "^1.14.0"
},
"require-dev": {
"doctrine/dbal": "^3.5",
"laravel/pint": "^1.2.1",
"nunomaduro/collision": "^6.0",
"nunomaduro/larastan": "^2.0.1",
"orchestra/testbench": "^7.15",
"orchestra/testbench": "^7.15|^8.0",
"pestphp/pest": "^1.22",
"pestphp/pest-plugin-laravel": "^1.1",
"phpstan/extension-installer": "^1.2",
Expand Down

0 comments on commit 99132e1

Please sign in to comment.