Skip to content

Commit ebe4bdd

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 1e9d371 commit ebe4bdd

File tree

2 files changed

+33
-39
lines changed

2 files changed

+33
-39
lines changed

‎Tests/OpenRouteServiceTest.php‎

Lines changed: 32 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public function testGeocodeWithRealAddress()
5555
/** @var \Geocoder\Model\Address $result */
5656
$result = $results->first();
5757
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
58-
$this->assertEquals(51.521124, $result->getCoordinates()->getLatitude(), '', 0.01);
59-
$this->assertEquals(-0.20360200000000001, $result->getCoordinates()->getLongitude(), '', 0.01);
58+
$this->assertEqualsWithDelta(51.521124, $result->getCoordinates()->getLatitude(), 0.01);
59+
$this->assertEqualsWithDelta(-0.20360200000000001, $result->getCoordinates()->getLongitude(), 0.01);
6060
$this->assertEquals('Acklam Road', $result->getStreetName());
6161
$this->assertEquals('London', $result->getLocality());
6262
$this->assertCount(4, $result->getAdminLevels());
@@ -80,8 +80,8 @@ public function testReverseWithRealCoordinates()
8080
/** @var \Geocoder\Model\Address $result */
8181
$result = $results->first();
8282
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
83-
$this->assertEquals(54.048411999999999, $result->getCoordinates()->getLatitude(), '', 0.001);
84-
$this->assertEquals(-2.7989549999999999, $result->getCoordinates()->getLongitude(), '', 0.001);
83+
$this->assertEqualsWithDelta(54.048411999999999, $result->getCoordinates()->getLatitude(), 0.001);
84+
$this->assertEqualsWithDelta(-2.7989549999999999, $result->getCoordinates()->getLongitude(), 0.001);
8585
$this->assertEquals(1, $result->getStreetNumber());
8686
$this->assertEquals('Gage Street', $result->getStreetName());
8787
$this->assertEquals('LA1 1UH', $result->getPostalCode());
@@ -126,8 +126,8 @@ public function testGeocodeWithCity()
126126
/** @var \Geocoder\Model\Address $result */
127127
$result = $results->first();
128128
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
129-
$this->assertEquals(52.379952, $result->getCoordinates()->getLatitude(), '', 0.01);
130-
$this->assertEquals(9.787455, $result->getCoordinates()->getLongitude(), '', 0.01);
129+
$this->assertEqualsWithDelta(52.379952, $result->getCoordinates()->getLatitude(), 0.01);
130+
$this->assertEqualsWithDelta(9.787455, $result->getCoordinates()->getLongitude(), 0.01);
131131
$this->assertEquals('Hanover', $result->getLocality());
132132
$this->assertCount(4, $result->getAdminLevels());
133133
$this->assertEquals('Niedersachsen', $result->getAdminLevels()->get(1)->getName());
@@ -137,17 +137,17 @@ public function testGeocodeWithCity()
137137
/** @var \Geocoder\Model\Address $result */
138138
$result = $results->get(1);
139139
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
140-
$this->assertEquals(52.37362, $result->getCoordinates()->getLatitude(), '', 0.01);
141-
$this->assertEquals(9.73711, $result->getCoordinates()->getLongitude(), '', 0.01);
140+
$this->assertEqualsWithDelta(52.37362, $result->getCoordinates()->getLatitude(), 0.01);
141+
$this->assertEqualsWithDelta(9.73711, $result->getCoordinates()->getLongitude(), 0.01);
142142
$this->assertCount(3, $result->getAdminLevels());
143143
$this->assertEquals('Niedersachsen', $result->getAdminLevels()->get(1)->getName());
144144
$this->assertEquals('Germany', $result->getCountry()->getName());
145145

146146
/** @var \Geocoder\Model\Address $result */
147147
$result = $results->get(2);
148148
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
149-
$this->assertEquals(18.393428, $result->getCoordinates()->getLatitude(), '', 0.01);
150-
$this->assertEquals(-78.107687, $result->getCoordinates()->getLongitude(), '', 0.01);
149+
$this->assertEqualsWithDelta(18.393428, $result->getCoordinates()->getLatitude(), 0.01);
150+
$this->assertEqualsWithDelta(-78.107687, $result->getCoordinates()->getLongitude(), 0.01);
151151
$this->assertNull($result->getLocality());
152152
$this->assertCount(2, $result->getAdminLevels());
153153
$this->assertEquals('Hanover', $result->getAdminLevels()->get(1)->getName());
@@ -156,8 +156,8 @@ public function testGeocodeWithCity()
156156
/** @var \Geocoder\Model\Address $result */
157157
$result = $results->get(3);
158158
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
159-
$this->assertEquals(39.192889999999998, $result->getCoordinates()->getLatitude(), '', 0.01);
160-
$this->assertEquals(-76.724140000000006, $result->getCoordinates()->getLongitude(), '', 0.01);
159+
$this->assertEqualsWithDelta(39.192889999999998, $result->getCoordinates()->getLatitude(), 0.01);
160+
$this->assertEqualsWithDelta(-76.724140000000006, $result->getCoordinates()->getLongitude(), 0.01);
161161
$this->assertEquals('Hanover', $result->getLocality());
162162
$this->assertCount(4, $result->getAdminLevels());
163163
$this->assertEquals('Hanover', $result->getAdminLevels()->get(3)->getName());
@@ -179,8 +179,8 @@ public function testGeocodeWithCityDistrict()
179179
/** @var \Geocoder\Model\Address $result */
180180
$result = $results->first();
181181
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
182-
$this->assertEquals(50.189017, $result->getCoordinates()->getLatitude(), '', 0.01);
183-
$this->assertEquals(8.6367809999999992, $result->getCoordinates()->getLongitude(), '', 0.01);
182+
$this->assertEqualsWithDelta(50.189017, $result->getCoordinates()->getLatitude(), 0.01);
183+
$this->assertEqualsWithDelta(8.6367809999999992, $result->getCoordinates()->getLongitude(), 0.01);
184184
$this->assertEquals('10a', $result->getStreetNumber());
185185
$this->assertEquals('Kalbacher Hauptstraße', $result->getStreetName());
186186
$this->assertEquals(60437, $result->getPostalCode());
@@ -193,12 +193,11 @@ public function testGeocodeWithCityDistrict()
193193
$this->assertEquals('DEU', $result->getCountry()->getCode());
194194
}
195195

196-
/**
197-
* @expectedException \Geocoder\Exception\QuotaExceeded
198-
* @expectedExceptionMessage Valid request but quota exceeded.
199-
*/
200196
public function testGeocodeQuotaExceeded()
201197
{
198+
$this->expectException(\Geocoder\Exception\QuotaExceeded::class);
199+
$this->expectExceptionMessage('Valid request but quota exceeded.');
200+
202201
$provider = new OpenRouteService(
203202
$this->getMockedHttpClient(
204203
'{
@@ -219,12 +218,11 @@ public function testGeocodeQuotaExceeded()
219218
$provider->geocodeQuery(GeocodeQuery::create('New York'));
220219
}
221220

222-
/**
223-
* @expectedException \Geocoder\Exception\InvalidCredentials
224-
* @expectedExceptionMessage Invalid or missing api key.
225-
*/
226221
public function testGeocodeInvalidApiKey()
227222
{
223+
$this->expectException(\Geocoder\Exception\InvalidCredentials::class);
224+
$this->expectExceptionMessage('Invalid or missing api key.');
225+
228226
$provider = new OpenRouteService(
229227
$this->getMockedHttpClient(
230228
'{
@@ -245,42 +243,38 @@ public function testGeocodeInvalidApiKey()
245243
$provider->geocodeQuery(GeocodeQuery::create('New York'));
246244
}
247245

248-
/**
249-
* @expectedException \Geocoder\Exception\UnsupportedOperation
250-
* @expectedExceptionMessage The openrouteservice provider does not support IP addresses, only street addresses.
251-
*/
252246
public function testGeocodeWithLocalhostIPv4()
253247
{
248+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
249+
$this->expectExceptionMessage('The openrouteservice provider does not support IP addresses, only street addresses.');
250+
254251
$provider = new OpenRouteService($this->getMockedHttpClient(), 'api_key');
255252
$provider->geocodeQuery(GeocodeQuery::create('127.0.0.1'));
256253
}
257254

258-
/**
259-
* @expectedException \Geocoder\Exception\UnsupportedOperation
260-
* @expectedExceptionMessage The openrouteservice provider does not support IP addresses, only street addresses.
261-
*/
262255
public function testGeocodeWithLocalhostIPv6()
263256
{
257+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
258+
$this->expectExceptionMessage('The openrouteservice provider does not support IP addresses, only street addresses.');
259+
264260
$provider = new OpenRouteService($this->getMockedHttpClient(), 'api_key');
265261
$provider->geocodeQuery(GeocodeQuery::create('::1'));
266262
}
267263

268-
/**
269-
* @expectedException \Geocoder\Exception\UnsupportedOperation
270-
* @expectedExceptionMessage The openrouteservice provider does not support IP addresses, only street addresses.
271-
*/
272264
public function testGeocodeWithRealIPv4()
273265
{
266+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
267+
$this->expectExceptionMessage('The openrouteservice provider does not support IP addresses, only street addresses.');
268+
274269
$provider = new OpenRouteService($this->getMockedHttpClient(), 'api_key');
275270
$provider->geocodeQuery(GeocodeQuery::create('74.200.247.59'));
276271
}
277272

278-
/**
279-
* @expectedException \Geocoder\Exception\UnsupportedOperation
280-
* @expectedExceptionMessage The openrouteservice provider does not support IP addresses, only street addresses.
281-
*/
282273
public function testGeocodeWithRealIPv6()
283274
{
275+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
276+
$this->expectExceptionMessage('The openrouteservice provider does not support IP addresses, only street addresses.');
277+
284278
$provider = new OpenRouteService($this->getMockedHttpClient(), 'api_key');
285279
$provider->geocodeQuery(GeocodeQuery::create('::ffff:74.200.247.59'));
286280
}

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
}
1212
],
1313
"require": {
14-
"php": "^7.2",
14+
"php": "^7.3 || ^8.0",
1515
"geocoder-php/common-http": "^4.0",
1616
"geocoder-php/pelias-provider": "^1.0",
1717
"willdurand/geocoder": "^4.0"

0 commit comments

Comments
 (0)