Skip to content

Commit

Permalink
Merge pull request #19 from laravel-shift/l11-compatibility
Browse files Browse the repository at this point in the history
Laravel 11.x Compatibility
  • Loading branch information
josiasmontag authored Mar 4, 2024
2 parents 3265239 + 1674e1f commit 4b6d5dc
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 26 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@ name: Tests

on:
push:
branches: [ master ]
branches:
- master
pull_request:
branches: [ master ]
branches:
- master

jobs:
build:

runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
php: [ "8.1","8.0", "7.4", "7.3", "7.2" ]
php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']

steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ composer.lock
.idea
.project
/.phpunit.result.cache
/.phpunit.cache
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
],
"require": {
"php": "^7.1 || ^8.0",
"illuminate/container": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
"illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
"illuminate/http": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
"illuminate/routing": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0",
"illuminate/container": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0 || ^11.0",
"illuminate/support": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0 || ^11.0",
"illuminate/http": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0 || ^11.0",
"illuminate/routing": "~5.8.0|^6.0|^7.0|^8.0|^9.0|^10.0 || ^11.0",
"cloudconvert/cloudconvert-php": "^3.1.0",
"symfony/psr-http-message-bridge": "^1.2|^2.0",
"symfony/psr-http-message-bridge": "^1.2|^2.0 || ^7.0",
"nyholm/psr7": "^1.2"
},
"require-dev": {
"phpunit/phpunit": "^7.0|^8.0|^9.5.10",
"orchestra/testbench": "~3.8.0|^4.0|^5.0|^6.0|^7.0|^8.0",
"phpunit/phpunit": "^7.0|^8.0|^9.5.10 || ^10.5",
"orchestra/testbench": "~3.8.0|^4.0|^5.0|^6.0|^7.0|^8.0 || ^9.0",
"php-http/guzzle7-adapter": "^1.0"
},
"autoload": {
Expand Down
22 changes: 7 additions & 15 deletions phpunit.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
>
<testsuites>
<testsuite name="Package Test Suite">
<directory suffix=".php">./tests/</directory>
</testsuite>
</testsuites>
<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">
<testsuites>
<testsuite name="Package Test Suite">
<directory suffix=".php">./tests/</directory>
<exclude>./tests/TestCase.php</exclude>
</testsuite>
</testsuites>
</phpunit>

0 comments on commit 4b6d5dc

Please sign in to comment.