Skip to content

Commit 874297d

Browse files
jbelienjbelien
authored
Enable PHP 8.0 support (#1102)
* Enable PHP 8.0 support * Add GitHub Actions * Upgrade php-http/curl-client + php-http/httplug * Upgrade PHPUnit * Drop PHP 7.2 support * Update GitHub Actions Remove PHP 7.2 * Update Travis CI Remove PHP 7.2 * Drop PHP 7.2 support
1 parent c4da1ea commit 874297d

File tree

2 files changed

+53
-57
lines changed

2 files changed

+53
-57
lines changed

‎Tests/MapQuestTest.php‎

Lines changed: 52 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ public function testGeocodeWithRealAddress()
7373
/** @var Location $result */
7474
$result = $results->first();
7575
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
76-
$this->assertEquals(48.866205, $result->getCoordinates()->getLatitude(), '', 0.01);
77-
$this->assertEquals(2.389089, $result->getCoordinates()->getLongitude(), '', 0.01);
76+
$this->assertEqualsWithDelta(48.866205, $result->getCoordinates()->getLatitude(), 0.01);
77+
$this->assertEqualsWithDelta(2.389089, $result->getCoordinates()->getLongitude(), 0.01);
7878
$this->assertEquals('10 Avenue Gambetta', $result->getStreetName());
7979
$this->assertEquals(75020, $result->getPostalCode());
8080
$this->assertEquals('Paris', $result->getLocality());
@@ -91,8 +91,8 @@ public function testGeocodeWithRealAddress()
9191

9292
$result = $results->get(1);
9393
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
94-
$this->assertEquals(48.810071, $result->getCoordinates()->getLatitude(), '', 0.01);
95-
$this->assertEquals(2.435937, $result->getCoordinates()->getLongitude(), '', 0.01);
94+
$this->assertEqualsWithDelta(48.810071, $result->getCoordinates()->getLatitude(), 0.01);
95+
$this->assertEqualsWithDelta(2.435937, $result->getCoordinates()->getLongitude(), 0.01);
9696
$this->assertEquals('10 Avenue Gambetta', $result->getStreetName());
9797
$this->assertEquals(94700, $result->getPostalCode());
9898
$this->assertEquals('Maisons-Alfort', $result->getLocality());
@@ -140,8 +140,8 @@ public function testGeocodeWithRealSpecificAddress()
140140
/** @var Location $result */
141141
$result = $results->first();
142142
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
143-
$this->assertEquals(36.062933, $result->getCoordinates()->getLatitude(), '', 0.01);
144-
$this->assertEquals(-86.672811, $result->getCoordinates()->getLongitude(), '', 0.01);
143+
$this->assertEqualsWithDelta(36.062933, $result->getCoordinates()->getLatitude(), 0.01);
144+
$this->assertEqualsWithDelta(-86.672811, $result->getCoordinates()->getLongitude(), 0.01);
145145
$this->assertEquals('Payne Road', $result->getStreetName());
146146
$this->assertEquals('37013', $result->getPostalCode());
147147
$this->assertEquals('Nashville', $result->getLocality());
@@ -172,8 +172,8 @@ public function testReverseWithRealCoordinates()
172172
/** @var Location $result */
173173
$result = $results->first();
174174
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
175-
$this->assertEquals(54.0484068, $result->getCoordinates()->getLatitude(), '', 0.001);
176-
$this->assertEquals(-2.7990345, $result->getCoordinates()->getLongitude(), '', 0.001);
175+
$this->assertEqualsWithDelta(54.0484068, $result->getCoordinates()->getLatitude(), 0.001);
176+
$this->assertEqualsWithDelta(-2.7990345, $result->getCoordinates()->getLongitude(), 0.001);
177177
$this->assertEquals('Collegian W.M.C.', $result->getStreetName());
178178
$this->assertEquals('LA1 1NP', $result->getPostalCode());
179179
$this->assertEquals('Lancaster', $result->getLocality());
@@ -205,8 +205,8 @@ public function testGeocodeWithCity()
205205
/** @var Location $result */
206206
$result = reset($resultsArray);
207207
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
208-
$this->assertEquals(52.374478, $result->getCoordinates()->getLatitude(), '', 0.01);
209-
$this->assertEquals(9.738553, $result->getCoordinates()->getLongitude(), '', 0.01);
208+
$this->assertEqualsWithDelta(52.374478, $result->getCoordinates()->getLatitude(), 0.01);
209+
$this->assertEqualsWithDelta(9.738553, $result->getCoordinates()->getLongitude(), 0.01);
210210
$this->assertEquals('Hanover', $result->getLocality());
211211
$this->assertCount(2, $result->getAdminLevels());
212212
$this->assertEquals('Region Hannover', $result->getAdminLevels()->get(2)->getName());
@@ -217,8 +217,8 @@ public function testGeocodeWithCity()
217217
/** @var Location $result */
218218
$result = next($resultsArray);
219219
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
220-
$this->assertEquals(18.384049, $result->getCoordinates()->getLatitude(), '', 0.01);
221-
$this->assertEquals(-78.131485, $result->getCoordinates()->getLongitude(), '', 0.01);
220+
$this->assertEqualsWithDelta(18.384049, $result->getCoordinates()->getLatitude(), 0.01);
221+
$this->assertEqualsWithDelta(-78.131485, $result->getCoordinates()->getLongitude(), 0.01);
222222
$this->assertEquals('', $result->getLocality());
223223
$this->assertCount(1, $result->getAdminLevels());
224224
$this->assertEquals('Hanover', $result->getAdminLevels()->get(2)->getName());
@@ -228,8 +228,8 @@ public function testGeocodeWithCity()
228228
/** @var Location $result */
229229
$result = next($resultsArray);
230230
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
231-
$this->assertEquals(43.703622, $result->getCoordinates()->getLatitude(), '', 0.01);
232-
$this->assertEquals(-72.288666, $result->getCoordinates()->getLongitude(), '', 0.01);
231+
$this->assertEqualsWithDelta(43.703622, $result->getCoordinates()->getLatitude(), 0.01);
232+
$this->assertEqualsWithDelta(-72.288666, $result->getCoordinates()->getLongitude(), 0.01);
233233
$this->assertEquals('Hanover', $result->getLocality());
234234
$this->assertCount(2, $result->getAdminLevels());
235235
$this->assertEquals('Grafton County', $result->getAdminLevels()->get(2)->getName());
@@ -240,8 +240,8 @@ public function testGeocodeWithCity()
240240
/** @var Location $result */
241241
$result = next($resultsArray);
242242
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
243-
$this->assertEquals(39.806325, $result->getCoordinates()->getLatitude(), '', 0.01);
244-
$this->assertEquals(-76.984273, $result->getCoordinates()->getLongitude(), '', 0.01);
243+
$this->assertEqualsWithDelta(39.806325, $result->getCoordinates()->getLatitude(), 0.01);
244+
$this->assertEqualsWithDelta(-76.984273, $result->getCoordinates()->getLongitude(), 0.01);
245245
$this->assertEquals('Hanover', $result->getLocality());
246246
$this->assertCount(2, $result->getAdminLevels());
247247
$this->assertEquals('York County', $result->getAdminLevels()->get(2)->getName());
@@ -252,8 +252,8 @@ public function testGeocodeWithCity()
252252
/** @var Location $result */
253253
$result = next($resultsArray);
254254
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
255-
$this->assertEquals(37.744783, $result->getCoordinates()->getLatitude(), '', 0.01);
256-
$this->assertEquals(-77.446416, $result->getCoordinates()->getLongitude(), '', 0.01);
255+
$this->assertEqualsWithDelta(37.744783, $result->getCoordinates()->getLatitude(), 0.01);
256+
$this->assertEqualsWithDelta(-77.446416, $result->getCoordinates()->getLongitude(), 0.01);
257257
$this->assertEquals('', $result->getLocality());
258258
$this->assertCount(2, $result->getAdminLevels());
259259
$this->assertEquals('Hanover County', $result->getAdminLevels()->get(2)->getName());
@@ -286,8 +286,8 @@ public function testGeocodeWithSpecificCity()
286286
/** @var Location $result */
287287
$result = reset($resultsArray);
288288
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
289-
$this->assertEquals(52.374478, $result->getCoordinates()->getLatitude(), '', 0.01);
290-
$this->assertEquals(9.738553, $result->getCoordinates()->getLongitude(), '', 0.01);
289+
$this->assertEqualsWithDelta(52.374478, $result->getCoordinates()->getLatitude(), 0.01);
290+
$this->assertEqualsWithDelta(9.738553, $result->getCoordinates()->getLongitude(), 0.01);
291291
$this->assertEquals('Hanover', $result->getLocality());
292292
$this->assertCount(2, $result->getAdminLevels());
293293
$this->assertEquals('Region Hannover', $result->getAdminLevels()->get(2)->getName());
@@ -298,8 +298,8 @@ public function testGeocodeWithSpecificCity()
298298
/** @var Location $result */
299299
$result = next($resultsArray);
300300
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
301-
$this->assertEquals(43.703622, $result->getCoordinates()->getLatitude(), '', 0.01);
302-
$this->assertEquals(-72.288666, $result->getCoordinates()->getLongitude(), '', 0.01);
301+
$this->assertEqualsWithDelta(43.703622, $result->getCoordinates()->getLatitude(), 0.01);
302+
$this->assertEqualsWithDelta(-72.288666, $result->getCoordinates()->getLongitude(), 0.01);
303303
$this->assertEquals('Hanover', $result->getLocality());
304304
$this->assertCount(2, $result->getAdminLevels());
305305
$this->assertEquals('Grafton County', $result->getAdminLevels()->get(2)->getName());
@@ -310,8 +310,8 @@ public function testGeocodeWithSpecificCity()
310310
/** @var Location $result */
311311
$result = next($resultsArray);
312312
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
313-
$this->assertEquals(39.806325, $result->getCoordinates()->getLatitude(), '', 0.01);
314-
$this->assertEquals(-76.984273, $result->getCoordinates()->getLongitude(), '', 0.01);
313+
$this->assertEqualsWithDelta(39.806325, $result->getCoordinates()->getLatitude(), 0.01);
314+
$this->assertEqualsWithDelta(-76.984273, $result->getCoordinates()->getLongitude(), 0.01);
315315
$this->assertEquals('Hanover', $result->getLocality());
316316
$this->assertCount(2, $result->getAdminLevels());
317317
$this->assertEquals('York County', $result->getAdminLevels()->get(2)->getName());
@@ -322,8 +322,8 @@ public function testGeocodeWithSpecificCity()
322322
/** @var Location $result */
323323
$result = next($resultsArray);
324324
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
325-
$this->assertEquals(40.661764, $result->getCoordinates()->getLatitude(), '', 0.01);
326-
$this->assertEquals(-75.412404, $result->getCoordinates()->getLongitude(), '', 0.01);
325+
$this->assertEqualsWithDelta(40.661764, $result->getCoordinates()->getLatitude(), 0.01);
326+
$this->assertEqualsWithDelta(-75.412404, $result->getCoordinates()->getLongitude(), 0.01);
327327
$this->assertEquals('Hanover', $result->getLocality());
328328
$this->assertCount(2, $result->getAdminLevels());
329329
$this->assertEquals('Northampton County', $result->getAdminLevels()->get(2)->getName());
@@ -334,8 +334,8 @@ public function testGeocodeWithSpecificCity()
334334
/** @var Location $result */
335335
$result = next($resultsArray);
336336
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
337-
$this->assertEquals(40.651401, $result->getCoordinates()->getLatitude(), '', 0.01);
338-
$this->assertEquals(-75.440663, $result->getCoordinates()->getLongitude(), '', 0.01);
337+
$this->assertEqualsWithDelta(40.651401, $result->getCoordinates()->getLatitude(), 0.01);
338+
$this->assertEqualsWithDelta(-75.440663, $result->getCoordinates()->getLongitude(), 0.01);
339339
$this->assertEquals('Hanover', $result->getLocality());
340340
$this->assertCount(2, $result->getAdminLevels());
341341
$this->assertEquals('Lehigh County', $result->getAdminLevels()->get(2)->getName());
@@ -370,8 +370,8 @@ public function testGeocodeWithSpecificCityAndBounds()
370370
$result = reset($resultsArray);
371371
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
372372
$this->assertEquals('17331', $result->getPostalCode());
373-
$this->assertEquals(39.806325, $result->getCoordinates()->getLatitude(), '', 0.01);
374-
$this->assertEquals(-76.984273, $result->getCoordinates()->getLongitude(), '', 0.01);
373+
$this->assertEqualsWithDelta(39.806325, $result->getCoordinates()->getLatitude(), 0.01);
374+
$this->assertEqualsWithDelta(-76.984273, $result->getCoordinates()->getLongitude(), 0.01);
375375
$this->assertEquals('Hanover', $result->getLocality());
376376
$this->assertCount(2, $result->getAdminLevels());
377377
$this->assertEquals('York County', $result->getAdminLevels()->get(2)->getName());
@@ -382,8 +382,8 @@ public function testGeocodeWithSpecificCityAndBounds()
382382
/** @var Location $result */
383383
$result = next($resultsArray);
384384
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
385-
$this->assertEquals(40.661764, $result->getCoordinates()->getLatitude(), '', 0.01);
386-
$this->assertEquals(-75.412404, $result->getCoordinates()->getLongitude(), '', 0.01);
385+
$this->assertEqualsWithDelta(40.661764, $result->getCoordinates()->getLatitude(), 0.01);
386+
$this->assertEqualsWithDelta(-75.412404, $result->getCoordinates()->getLongitude(), 0.01);
387387
$this->assertEquals('Hanover', $result->getLocality());
388388
$this->assertCount(2, $result->getAdminLevels());
389389
$this->assertEquals('Northampton County', $result->getAdminLevels()->get(2)->getName());
@@ -394,8 +394,8 @@ public function testGeocodeWithSpecificCityAndBounds()
394394
/** @var Location $result */
395395
$result = next($resultsArray);
396396
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
397-
$this->assertEquals(40.651401, $result->getCoordinates()->getLatitude(), '', 0.01);
398-
$this->assertEquals(-75.440663, $result->getCoordinates()->getLongitude(), '', 0.01);
397+
$this->assertEqualsWithDelta(40.651401, $result->getCoordinates()->getLatitude(), 0.01);
398+
$this->assertEqualsWithDelta(-75.440663, $result->getCoordinates()->getLongitude(), 0.01);
399399
$this->assertEquals('Hanover', $result->getLocality());
400400
$this->assertCount(2, $result->getAdminLevels());
401401
$this->assertEquals('Lehigh County', $result->getAdminLevels()->get(2)->getName());
@@ -407,8 +407,8 @@ public function testGeocodeWithSpecificCityAndBounds()
407407
$result = next($resultsArray);
408408
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
409409
$this->assertEquals('20794:21076', $result->getPostalCode());
410-
$this->assertEquals(39.192885, $result->getCoordinates()->getLatitude(), '', 0.01);
411-
$this->assertEquals(-76.724137, $result->getCoordinates()->getLongitude(), '', 0.01);
410+
$this->assertEqualsWithDelta(39.192885, $result->getCoordinates()->getLatitude(), 0.01);
411+
$this->assertEqualsWithDelta(-76.724137, $result->getCoordinates()->getLongitude(), 0.01);
412412
$this->assertEquals('Hanover', $result->getLocality());
413413
$this->assertCount(2, $result->getAdminLevels());
414414
$this->assertEquals('Howard County', $result->getAdminLevels()->get(2)->getName());
@@ -419,8 +419,8 @@ public function testGeocodeWithSpecificCityAndBounds()
419419
/** @var Location $result */
420420
$result = next($resultsArray);
421421
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
422-
$this->assertEquals(52.374478, $result->getCoordinates()->getLatitude(), '', 0.01);
423-
$this->assertEquals(9.738553, $result->getCoordinates()->getLongitude(), '', 0.01);
422+
$this->assertEqualsWithDelta(52.374478, $result->getCoordinates()->getLatitude(), 0.01);
423+
$this->assertEqualsWithDelta(9.738553, $result->getCoordinates()->getLongitude(), 0.01);
424424
$this->assertEquals('Hanover', $result->getLocality());
425425
$this->assertCount(2, $result->getAdminLevels());
426426
$this->assertEquals('Region Hannover', $result->getAdminLevels()->get(2)->getName());
@@ -444,8 +444,8 @@ public function testGeocodeWithCityDistrict()
444444
/** @var Location $result */
445445
$result = $results->first();
446446
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
447-
$this->assertEquals(50.189062, $result->getCoordinates()->getLatitude(), '', 0.01);
448-
$this->assertEquals(8.636567, $result->getCoordinates()->getLongitude(), '', 0.01);
447+
$this->assertEqualsWithDelta(50.189062, $result->getCoordinates()->getLatitude(), 0.01);
448+
$this->assertEqualsWithDelta(8.636567, $result->getCoordinates()->getLongitude(), 0.01);
449449
$this->assertEquals('Kalbacher Hauptstraße 10', $result->getStreetName());
450450
$this->assertEquals(60437, $result->getPostalCode());
451451
$this->assertEquals('Frankfurt', $result->getLocality());
@@ -461,42 +461,38 @@ public function testGeocodeWithCityDistrict()
461461
$this->assertNull($result->getTimezone());
462462
}
463463

464-
/**
465-
* @expectedException \Geocoder\Exception\UnsupportedOperation
466-
* @expectedExceptionMessage The MapQuest provider does not support IP addresses, only street addresses.
467-
*/
468464
public function testGeocodeWithLocalhostIPv4()
469465
{
466+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
467+
$this->expectExceptionMessage('The MapQuest provider does not support IP addresses, only street addresses.');
468+
470469
$provider = new MapQuest($this->getMockedHttpClient(), 'api_key');
471470
$provider->geocodeQuery(GeocodeQuery::create('127.0.0.1'));
472471
}
473472

474-
/**
475-
* @expectedException \Geocoder\Exception\UnsupportedOperation
476-
* @expectedExceptionMessage The MapQuest provider does not support IP addresses, only street addresses.
477-
*/
478473
public function testGeocodeWithLocalhostIPv6()
479474
{
475+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
476+
$this->expectExceptionMessage('The MapQuest provider does not support IP addresses, only street addresses.');
477+
480478
$provider = new MapQuest($this->getMockedHttpClient(), 'api_key');
481479
$provider->geocodeQuery(GeocodeQuery::create('::1'));
482480
}
483481

484-
/**
485-
* @expectedException \Geocoder\Exception\UnsupportedOperation
486-
* @expectedExceptionMessage The MapQuest provider does not support IP addresses, only street addresses.
487-
*/
488482
public function testGeocodeWithRealIPv4()
489483
{
484+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
485+
$this->expectExceptionMessage('The MapQuest provider does not support IP addresses, only street addresses.');
486+
490487
$provider = new MapQuest($this->getMockedHttpClient(), 'api_key');
491488
$provider->geocodeQuery(GeocodeQuery::create('74.200.247.59'));
492489
}
493490

494-
/**
495-
* @expectedException \Geocoder\Exception\UnsupportedOperation
496-
* @expectedExceptionMessage The MapQuest provider does not support IP addresses, only street addresses.
497-
*/
498491
public function testGeocodeWithRealIPv6()
499492
{
493+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
494+
$this->expectExceptionMessage('The MapQuest provider does not support IP addresses, only street addresses.');
495+
500496
$provider = new MapQuest($this->getMockedHttpClient(), 'api_key');
501497
$provider->geocodeQuery(GeocodeQuery::create('::ffff:74.200.247.59'));
502498
}

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.2",
15+
"php": "^7.3 || ^8.0",
1616
"geocoder-php/common-http": "^4.0",
1717
"willdurand/geocoder": "^4.0"
1818
},

0 commit comments

Comments
 (0)