Skip to content

Commit

Permalink
Merge pull request #145 from laravel-at/master
Browse files Browse the repository at this point in the history
Laravel 6.0 support
  • Loading branch information
tihomiro committed Sep 9, 2019
2 parents 82bc71c + c37bcfa commit fe8fbf5
Show file tree
Hide file tree
Showing 5 changed files with 1,082 additions and 1,074 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -2,3 +2,5 @@
composer.phar
composer.lock
.DS_Store
.idea
.phpunit.*
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,8 +1,8 @@
language: php

php:
- 7.0
- 7.1
- 7.2
- 7.3

before_script:
- curl -s http://getcomposer.org/installer | php
Expand Down
20 changes: 12 additions & 8 deletions composer.json
Expand Up @@ -10,14 +10,14 @@
}
],
"require": {
"php": ">=5.4.0",
"illuminate/support": "^5.3.8 || ^6.0.0"
"php": "^7.2",
"illuminate/support": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0"
},
"require-dev": {
"mockery/mockery": "dev-master",
"illuminate/filesystem": "5.x || 6.x",
"laravel/framework": "^5.3.8",
"phpunit/phpunit": "^5.7"
"mockery/mockery": "^1.0.0",
"illuminate/filesystem": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0",
"laravel/framework": "~5.5.0|~5.6.0|~5.7.0|~5.8.0|^6.0",
"phpunit/phpunit": "^8.0"
},
"autoload": {
"psr-0": {
Expand All @@ -32,12 +32,16 @@
"Orangehill\\Iseed\\Tests\\": "tests"
}
},
"minimum-stability": "dev",
"extra": {
"laravel": {
"providers": [
"Orangehill\\Iseed\\IseedServiceProvider"
]
}
}
},
"config": {
"sort-packages": true
},
"minimum-stability": "dev",
"prefer-stable": true
}
2 changes: 1 addition & 1 deletion phpunit.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="vendor/autoload.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
verbose="true"
>
<testsuites>
Expand Down

0 comments on commit fe8fbf5

Please sign in to comment.