Skip to content

Commit cecbcfd

Browse files
mikebronnermikebronner
committed
Merge branch 'master' of github.com:geocoder-php/GeocoderLaravel
2 parents 9bf44e1 + 71f43e2 commit cecbcfd

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

‎.phpunit.result.cache

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
C:37:"PHPUnit\Runner\DefaultTestResultCache":2941:{a:2:{s:7:"defects";a:2:{s:94:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItReverseGeocodesCoordinates";i:4;s:77:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testCacheIsUsed";i:4;}s:5:"times";a:26:{s:94:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItReverseGeocodesCoordinates";d:0.296;s:89:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItResolvesAGivenAddress";d:0.222;s:91:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItResolvesAGivenIPAddress";d:0.01;s:100:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItResolvesAGivenAddressWithUmlauts";d:0.216;s:108:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItResolvesAGivenAddressWithUmlautsInRegion";d:0.21;s:91:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItCanUseASpecificProvider";d:0.187;s:83:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItDumpsAndAddress";d:0.214;s:101:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItThrowsAnExceptionForInvalidDumper";d:0.207;s:72:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testConfig";d:0.008;s:81:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testLoadedProviders";d:0.01;s:74:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testGeocoder";d:0.009;s:77:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testCacheIsUsed";d:0.247;s:93:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testGeocodeQueryProvidesResults";d:0.262;s:93:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testReverseQueryProvidesResults";d:0.391;s:87:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testFacadeProvidesResults";d:0.215;s:102:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItCanUseMaxMindBinaryWithoutProvider";d:0.008;s:86:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testGetNameReturnsString";d:0.007;s:83:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testLimitingOfResults";d:0.804;s:84:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testFetchingAllResults";d:0.231;s:78:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testGetProviders";d:0.007;s:77:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testGetProvider";d:0.007;s:92:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testJapaneseCharacterGeocoding";d:0.461;s:81:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItProvidesState";d:0.218;s:86:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItProvidesAdminLevel";d:0.201;s:91:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testItHandlesOnlyCityAndState";d:0.788;s:90:"Geocoder\Laravel\Tests\Feature\Providers\GeocoderServiceTest::testEmptyResultsAreNotCached";d:0.586;}}}

‎composer.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"geocoder-php/google-maps-provider": "^4.0",
2929
"guzzlehttp/psr7": "*",
3030
"http-interop/http-factory-guzzle": "^1.0",
31-
"illuminate/cache": "5.0 - 5.8",
32-
"illuminate/support": "5.0 - 5.8",
31+
"illuminate/cache": "5.0 - 6.0",
32+
"illuminate/support": "5.0 - 6.0",
3333
"php-http/curl-client": "*",
3434
"php": ">=7.1.3",
3535
"willdurand/geocoder": "^4.0"
@@ -41,12 +41,11 @@
4141
"geocoder-php/geoip2-provider": "^4.0",
4242
"geocoder-php/maxmind-binary-provider": "^4.0",
4343
"mockery/mockery": "*",
44-
"orchestra/testbench-browser-kit": "3.8.*",
45-
"orchestra/database": "3.8.x-dev@dev",
46-
"orchestra/testbench-dusk": "3.8.x-dev@dev",
47-
"orchestra/testbench": "3.8.*",
44+
"orchestra/testbench-browser-kit": "3.9.x-dev@dev",
45+
"orchestra/testbench-dusk": "3.9.x-dev@dev",
46+
"orchestra/testbench": "3.9.x-dev@dev",
4847
"php-coveralls/php-coveralls": "*",
49-
"phpunit/phpunit": "^7.5",
48+
"phpunit/phpunit": "8.*",
5049
"sebastian/phpcpd": "*"
5150
},
5251
"autoload": {
@@ -67,6 +66,7 @@
6766
]
6867
}
6968
},
69+
"minimum-stability": "dev",
7070
"prefer-stable": true,
7171
"config": {
7272
"preferred-install": "dist",

‎tests/CreatesApplication.php

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php namespace Geocoder\Laravel\Tests;
22

3-
use Orchestra\Database\ConsoleServiceProvider;
43
use Geocoder\Laravel\Providers\GeocoderService;
54

65
trait CreatesApplication
@@ -20,7 +19,6 @@ protected function getPackageProviders($app)
2019
{
2120
return [
2221
GeocoderService::class,
23-
ConsoleServiceProvider::class,
2422
];
2523
}
2624

‎tests/Feature/Providers/GeocoderServiceTest.php

+5-4
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Geocoder\Query\ReverseQuery;
1717
use Http\Client\Curl\Client as CurlAdapter;
1818
use Illuminate\Support\Collection;
19+
use Illuminate\Support\Str;
1920

2021
/**
2122
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -30,7 +31,7 @@ public function testItReverseGeocodesCoordinates()
3031
->reverse(38.897957, -77.036560)
3132
->get()
3233
->filter(function (GoogleAddress $address) {
33-
return str_contains($address->getStreetName() ?? '', 'Northwest');
34+
return Str::contains($address->getStreetName() ?? '', 'Northwest');
3435
})
3536
->first();
3637

@@ -159,7 +160,7 @@ public function testGeocoder()
159160

160161
public function testCacheIsUsed()
161162
{
162-
$cacheKey = sha1(str_slug(strtolower(urlencode('1600 Pennsylvania Ave NW, Washington, DC 20500, USA'))));
163+
$cacheKey = sha1(Str::slug(strtolower(urlencode('1600 Pennsylvania Ave NW, Washington, DC 20500, USA'))));
163164

164165
$result = app('geocoder')
165166
->geocode('1600 Pennsylvania Ave NW, Washington, DC 20500, USA')
@@ -270,7 +271,7 @@ public function testGetProvider()
270271

271272
public function testJapaneseCharacterGeocoding()
272273
{
273-
$cacheKey = sha1(str_slug(strtolower(urlencode('108-0075 東京都港区港南２丁目１６－３'))));
274+
$cacheKey = sha1(Str::slug(strtolower(urlencode('108-0075 東京都港区港南２丁目１６－３'))));
274275

275276
app('geocoder')
276277
->geocode('108-0075 東京都港区港南２丁目１６－３')
@@ -310,7 +311,7 @@ public function testItHandlesOnlyCityAndState()
310311

311312
public function testEmptyResultsAreNotCached()
312313
{
313-
$cacheKey = md5(str_slug(strtolower(urlencode('_'))));
314+
$cacheKey = md5(Str::slug(strtolower(urlencode('_'))));
314315

315316
Geocoder::geocode('_')->get();
316317

0 commit comments

Comments
 (0)