Skip to content

Commit 8a9b1b5

Browse files
authored
Merge pull request #173 from mikemand/laravel-7.0
Support for Laravel 7
2 parents a6f00b8 + 6a73f31 commit 8a9b1b5

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
language: php
22

33
php:
4-
- 7.1
54
- 7.2
65
- 7.3
6+
- 7.4
77

88
before_script:
99
- curl -s http://getcomposer.org/installer | php

composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"description": "Support for multiple GeoIP services.",
44
"keywords": [
55
"laravel",
6-
"laravel 5",
76
"geoip",
87
"location",
98
"geolocation",
@@ -19,17 +18,17 @@
1918
}
2019
],
2120
"require": {
22-
"php": "^7.1",
23-
"illuminate/support": "~5.5|^6.0",
24-
"illuminate/console": "~5.5|^6.0"
21+
"php": "^7.2",
22+
"illuminate/support": "^6.0|^7.0",
23+
"illuminate/console": "^6.0|^7.0"
2524
},
2625
"suggest": {
2726
"geoip2/geoip2": "Required to use the MaxMind database or web service with GeoIP (~2.1).",
2827
"monolog/monolog": "Allows for storing location not found errors to the log"
2928
},
3029
"require-dev": {
31-
"phpunit/phpunit": "^7.0",
32-
"mockery/mockery": "^0.9.4",
30+
"phpunit/phpunit": "^8.0",
31+
"mockery/mockery": "^1.3",
3332
"geoip2/geoip2": "~2.1",
3433
"vlucas/phpdotenv": "^3.5"
3534
},

0 commit comments

Comments
 (0)