Skip to content

Commit 4b6d5dc

Browse files
authored
Merge pull request #19 from laravel-shift/l11-compatibility
Laravel 11.x Compatibility
2 parents 3265239 + 1674e1f commit 4b6d5dc

File tree

4 files changed

+20
-26
lines changed

4 files changed

+20
-26
lines changed

.github/workflows/run-tests.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@ name: Tests
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- master
67
pull_request:
7-
branches: [ master ]
8+
branches:
9+
- master
810

911
jobs:
1012
build:
11-
1213
runs-on: ubuntu-latest
1314

1415
strategy:
1516
fail-fast: false
1617
matrix:
17-
php: [ "8.1","8.0", "7.4", "7.3", "7.2" ]
18+
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
1819

1920
steps:
2021
- uses: actions/checkout@v2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ composer.lock
44
.idea
55
.project
66
/.phpunit.result.cache
7+
/.phpunit.cache

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
],
1212
"require": {
1313
"php": "^7.1 || ^8.0",
14-
"illuminate/container": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
15-
"illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
16-
"illuminate/http": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
17-
"illuminate/routing": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
14+
"illuminate/container": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0 || ^11.0",
15+
"illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0 || ^11.0",
16+
"illuminate/http": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0 || ^11.0",
17+
"illuminate/routing": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0 || ^11.0",
1818
"cloudconvert/cloudconvert-php": "^3.1.0",
19-
"symfony/psr-http-message-bridge": "^1.2|^2.0",
19+
"symfony/psr-http-message-bridge": "^1.2|^2.0 || ^7.0",
2020
"nyholm/psr7": "^1.2"
2121
},
2222
"require-dev": {
23-
"phpunit/phpunit": "^7.0|^8.0|^9.5.10",
24-
"orchestra/testbench": "~3.8.0|^4.0|^5.0|^6.0|^7.0|^8.0",
23+
"phpunit/phpunit": "^7.0|^8.0|^9.5.10 || ^10.5",
24+
"orchestra/testbench": "~3.8.0|^4.0|^5.0|^6.0|^7.0|^8.0 || ^9.0",
2525
"php-http/guzzle7-adapter": "^1.0"
2626
},
2727
"autoload": {

phpunit.xml

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit backupGlobals="false"
3-
backupStaticAttributes="false"
4-
bootstrap="vendor/autoload.php"
5-
colors="true"
6-
convertErrorsToExceptions="true"
7-
convertNoticesToExceptions="true"
8-
convertWarningsToExceptions="true"
9-
processIsolation="false"
10-
stopOnFailure="false"
11-
>
12-
<testsuites>
13-
<testsuite name="Package Test Suite">
14-
<directory suffix=".php">./tests/</directory>
15-
</testsuite>
16-
</testsuites>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
3+
<testsuites>
4+
<testsuite name="Package Test Suite">
5+
<directory suffix=".php">./tests/</directory>
6+
<exclude>./tests/TestCase.php</exclude>
7+
</testsuite>
8+
</testsuites>
179
</phpunit>

0 commit comments

Comments
 (0)