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.

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

Laravel 8 & Guzzle 7 support #101

Merged
merged 4 commits into from
Sep 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: php

php:
- 7.2
- 7.3
- 7.4

env:
matrix:
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
}
],
"require": {
"php" : "^7.2",
"illuminate/support": "~5.8.0|^6.0|^7.0",
"illuminate/routing": "~5.8.0|^6.0|^7.0",
"illuminate/config": "~5.8.0|^6.0|^7.0",
"illuminate/queue": "~5.8.0|^6.0|^7.0",
"guzzlehttp/guzzle": "^6.3",
"php" : "^7.3",
"illuminate/support": "~5.8.0|^6.0|^7.0|^8.0",
"illuminate/routing": "~5.8.0|^6.0|^7.0|^8.0",
"illuminate/config": "~5.8.0|^6.0|^7.0|^8.0",
"illuminate/queue": "~5.8.0|^6.0|^7.0|^8.0",
"guzzlehttp/guzzle": "^7.0",
"laravel/helpers": "^1.0"

},
"require-dev": {
"mockery/mockery": "^1.0",
"orchestra/testbench": "~3.8.0|^4.0|^5.0",
"phpunit/phpunit": "^8.0"
"phpunit/phpunit": "^9.2"
},
"autoload": {
"psr-4": {
Expand Down
31 changes: 11 additions & 20 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="vendor/autoload.php"
backupGlobals="false"
backupStaticAttributes="false"
colors="true"
verbose="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false">
<testsuites>
<testsuite name="Spatie Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">src/</directory>
</whitelist>
</filter>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
<coverage>
<include>
<directory suffix=".php">src/</directory>
</include>
</coverage>
<testsuites>
<testsuite name="Spatie Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
</phpunit>