Skip to content

Fixed broken build on master #87

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jun 23, 2017
Merged

Fixed broken build on master #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
591d106
Fixed broken build on HHVM
Nyholm Jun 23, 2017
a82c4a6
Updated requirements
Nyholm Jun 23, 2017
6abcd83
Updated to a less strange IP
Nyholm Jun 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
language: php

php:
- 5.4
- 5.5
- 5.6
- 7.0
- hhvm
- 7.1

before_script:
- travis_retry composer self-update
- travis_retry composer install --no-interaction --prefer-source --dev

script: phpunit --coverage-text --coverage-clover ./build/logs/clover.xml
script:
- ./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml

after_script: php vendor/bin/coveralls
after_script:
- php vendor/bin/coveralls
10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
}
],
"require": {
"php": ">=5.4",
"php": "^7.0",
"geocoder-php/bing-maps-provider": "dev-master@dev",
"geocoder-php/chain-provider": "dev-master@dev",
"geocoder-php/common-http": "dev-master@dev",
"php-http/curl-client": "dev-master@dev",
"php-http/curl-client": "^1.7",
"geocoder-php/free-geoip-provider": "dev-master@dev",
"geocoder-php/google-maps-provider": "dev-master@dev",
"geocoder-php/maxmind-binary-provider": "dev-master@dev",
Expand All @@ -40,10 +40,10 @@
},
"require-dev": {
"fzaninotto/faker": "~1.4",
"mockery/mockery": "0.9.*",
"mockery/mockery": "^0.9",
"phpunit/phpunit": "~5.0",
"symfony/css-selector": "3.1.*",
"symfony/dom-crawler": "3.1.*",
"symfony/css-selector": "^3.1",
"symfony/dom-crawler": "^3.1",
"doctrine/dbal": "^2.5",
"laravel/laravel": "^5.3",
"phploc/phploc": "^3.0",
Expand Down
2 changes: 1 addition & 1 deletion tests/Laravel5_3/Providers/GeocoderServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function testItResolvesAGivenIPAddress()

// Act
$results = app('geocoder')
->geocode('8.8.8.8')
->geocode('72.229.28.185')
->get();

// Assert
Expand Down