Skip to content

Commit 8be0cb2

Browse files
authored
Merge pull request #87 from geocoder-php/Nyholm-patch-1
Fixed broken build on master
2 parents 2352f90 + 6abcd83 commit 8be0cb2

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
language: php
22

33
php:
4-
- 5.4
5-
- 5.5
6-
- 5.6
74
- 7.0
8-
- hhvm
5+
- 7.1
96

107
before_script:
118
- travis_retry composer self-update
129
- travis_retry composer install --no-interaction --prefer-source --dev
1310

14-
script: phpunit --coverage-text --coverage-clover ./build/logs/clover.xml
11+
script:
12+
- ./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml
1513

16-
after_script: php vendor/bin/coveralls
14+
after_script:
15+
- php vendor/bin/coveralls

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
}
2424
],
2525
"require": {
26-
"php": ">=5.4",
26+
"php": "^7.0",
2727
"geocoder-php/bing-maps-provider": "dev-master@dev",
2828
"geocoder-php/chain-provider": "dev-master@dev",
2929
"geocoder-php/common-http": "dev-master@dev",
30-
"php-http/curl-client": "dev-master@dev",
30+
"php-http/curl-client": "^1.7",
3131
"geocoder-php/free-geoip-provider": "dev-master@dev",
3232
"geocoder-php/google-maps-provider": "dev-master@dev",
3333
"geocoder-php/maxmind-binary-provider": "dev-master@dev",
@@ -40,10 +40,10 @@
4040
},
4141
"require-dev": {
4242
"fzaninotto/faker": "~1.4",
43-
"mockery/mockery": "0.9.*",
43+
"mockery/mockery": "^0.9",
4444
"phpunit/phpunit": "~5.0",
45-
"symfony/css-selector": "3.1.*",
46-
"symfony/dom-crawler": "3.1.*",
45+
"symfony/css-selector": "^3.1",
46+
"symfony/dom-crawler": "^3.1",
4747
"doctrine/dbal": "^2.5",
4848
"laravel/laravel": "^5.3",
4949
"phploc/phploc": "^3.0",

tests/Laravel5_3/Providers/GeocoderServiceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function testItResolvesAGivenIPAddress()
6767

6868
// Act
6969
$results = app('geocoder')
70-
->geocode('8.8.8.8')
70+
->geocode('72.229.28.185')
7171
->get();
7272

7373
// Assert

0 commit comments

Comments
 (0)