Skip to content

Commit 642b6e7

Browse files
author
Riccardo Dalla Via
authored
ADD Laravel 10 compatibility (#37)
1 parent 33cb4c9 commit 642b6e7

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

.github/workflows/psalm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: '7.4'
19+
php-version: '8.0'
2020
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
2121
coverage: none
2222

.github/workflows/run-tests.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,19 @@ jobs:
1313
fail-fast: true
1414
matrix:
1515
os: [ubuntu-latest, windows-latest]
16-
php: [8.1, 8.0, 7.4]
17-
laravel: [9.*, 8.*]
16+
php: [8.2, 8.1, 8.0]
17+
laravel: [10.*, 9.*]
1818
stability: [prefer-lowest, prefer-stable]
1919
include:
20-
- laravel: 8.*
21-
testbench: ^6.23
20+
- laravel: 10.*
21+
testbench: 8.*
22+
carbon: ^2.63
2223
- laravel: 9.*
2324
testbench: 7.*
25+
carbon: ^2.63
2426
exclude:
25-
- php: 7.4
26-
laravel: 9.*
27+
- laravel: 10.*
28+
php: 8.0
2729

2830
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2931

@@ -44,7 +46,7 @@ jobs:
4446
echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
4547
- name: Install dependencies
4648
run: |
47-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
49+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:${{ matrix.carbon }}" --no-interaction --no-update
4850
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
4951
- name: Execute tests
5052
run: vendor/bin/phpunit

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2022 MAIZE SRL <[email protected]>
3+
Copyright (c) 2023 MAIZE SRL <[email protected]>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626
}
2727
],
2828
"require": {
29-
"php": "^7.4|^8.0",
30-
"illuminate/database": "^8.0|^9.0",
31-
"illuminate/support": "^8.0|^9.0",
32-
"spatie/laravel-package-tools": "^1.11.3"
29+
"php": "^8.0",
30+
"illuminate/database": "^9.0|^10.0",
31+
"illuminate/support": "^9.0|^10.0",
32+
"spatie/laravel-package-tools": "^1.14.1"
3333
},
3434
"require-dev": {
3535
"friendsofphp/php-cs-fixer": "^3.7",
36-
"orchestra/testbench": "^6.23|^7.0",
36+
"orchestra/testbench": "^7.0|^8.0",
3737
"phpunit/phpunit": "^9.5",
3838
"spatie/laravel-ray": "^1.29",
3939
"vimeo/psalm": "^4.22"

0 commit comments

Comments
 (0)