Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2.x] Add Laravel 10 compatibility #67

Merged
merged 8 commits into from
Feb 23, 2023
Merged

[2.x] Add Laravel 10 compatibility #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
490598c
add Laravel 10 and PHP 8.2 to the testing matrix
lupinitylabs Feb 22, 2023
cdff572
migrate phpunit.xml to new schema
lupinitylabs Feb 22, 2023
ad7934f
upgrade dependencies to support Laravel 10
lupinitylabs Feb 22, 2023
8e5c8d3
revert phpunit to version 9.5 in order to still support Laravel 8
lupinitylabs Feb 22, 2023
e572b03
drop laravel 8 support because of its lack of Sanctum 3.2 support
lupinitylabs Feb 22, 2023
6be38b3
drop orchestra/testbench v6 along with Laravel 8 support
lupinitylabs Feb 22, 2023
f75353a
remove Laravel 8 and PHP 8.0 from testing matrix
lupinitylabs Feb 22, 2023
04e7546
Merge branch 'master' into feature/laravel-10-compatibility
gael-connan-cybex Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
strategy:
fail-fast: true
matrix:
php: [ 8.0, 8.1 ]
laravel: [ 8.*, 9.* ]
php: [ 8.1, 8.2 ]
laravel: [ 9.*, 10.* ]
dependency-version: [ prefer-stable ]

name: PHP ${{ matrix.php }} with Laravel ${{ matrix.laravel }} (${{ matrix.dependency-version }})
Expand Down
14 changes: 7 additions & 7 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"ext-curl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-pdo": "*",
"ext-sodium": "*",
"guzzlehttp/guzzle": "^7.4",
"illuminate/support": "^8.0|^9.0",
"laravel/framework": "^8.0|^9.0",
"laravel/sanctum": "^2.4",
"ext-pdo": "*"
"illuminate/support": "^9.0|^10.0",
"laravel/framework": "^9.0|^10.0",
"laravel/sanctum": "^3.2"
},
"require-dev": {
"laravel/sail": "^1.15",
"orchestra/testbench": "^6.23|^7.0",
"laravel/sail": "^1.18",
"orchestra/testbench": "^7.0|^8.0",
"phpunit/phpunit": "^9.5"
},
"autoload": {
Expand Down
15 changes: 4 additions & 11 deletions phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="vendor/autoload.php"
backupGlobals="false"
backupStaticAttributes="false"
colors="true"
verbose="true"
testdox="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false"
colors="true" testdox="true" processIsolation="false" stopOnFailure="false"
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache"
backupStaticProperties="false">
<testsuites>
<testsuite name="Test Suite">
<directory>Tests</directory>
Expand Down