Skip to content

Commit

Permalink
Merge pull request #173 from mikemand/laravel-7.0
Browse files Browse the repository at this point in the history
Support for Laravel 7
  • Loading branch information
Torann authored Mar 9, 2020
2 parents a6f00b8 + 6a73f31 commit 8a9b1b5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
language: php

php:
- 7.1
- 7.2
- 7.3
- 7.4

before_script:
- curl -s http://getcomposer.org/installer | php
Expand Down
11 changes: 5 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"description": "Support for multiple GeoIP services.",
"keywords": [
"laravel",
"laravel 5",
"geoip",
"location",
"geolocation",
Expand All @@ -19,17 +18,17 @@
}
],
"require": {
"php": "^7.1",
"illuminate/support": "~5.5|^6.0",
"illuminate/console": "~5.5|^6.0"
"php": "^7.2",
"illuminate/support": "^6.0|^7.0",
"illuminate/console": "^6.0|^7.0"
},
"suggest": {
"geoip2/geoip2": "Required to use the MaxMind database or web service with GeoIP (~2.1).",
"monolog/monolog": "Allows for storing location not found errors to the log"
},
"require-dev": {
"phpunit/phpunit": "^7.0",
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^8.0",
"mockery/mockery": "^1.3",
"geoip2/geoip2": "~2.1",
"vlucas/phpdotenv": "^3.5"
},
Expand Down

0 comments on commit 8a9b1b5

Please sign in to comment.