Skip to content

Commit d006d0b

Browse files
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 d08a0fd commit d006d0b

File tree

2 files changed

+19
-23
lines changed

2 files changed

+19
-23
lines changed

Tests/GraphHopperTest.php

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public function testGeocodeWithRealAddress()
4848
/** @var \Geocoder\Model\Address $result */
4949
$result = $results->first();
5050
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
51-
$this->assertEquals(51.521124, $result->getCoordinates()->getLatitude(), '', 0.01);
52-
$this->assertEquals(-0.20360200000000001, $result->getCoordinates()->getLongitude(), '', 0.01);
51+
$this->assertEqualsWithDelta(51.521124, $result->getCoordinates()->getLatitude(), 0.01);
52+
$this->assertEqualsWithDelta(-0.20360200000000001, $result->getCoordinates()->getLongitude(), 0.01);
5353
$this->assertEquals('Acklam Road', $result->getStreetName());
5454
$this->assertEquals('London', $result->getLocality());
5555
$this->assertEquals('United Kingdom', $result->getCountry()->getName());
@@ -70,8 +70,8 @@ public function testGeocodeWithRealAddressAndLocale()
7070
/** @var \Geocoder\Model\Address $result */
7171
$result = $results->first();
7272
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
73-
$this->assertEquals(51.521124, $result->getCoordinates()->getLatitude(), '', 0.01);
74-
$this->assertEquals(-0.20360200000000001, $result->getCoordinates()->getLongitude(), '', 0.01);
73+
$this->assertEqualsWithDelta(51.521124, $result->getCoordinates()->getLatitude(), 0.01);
74+
$this->assertEqualsWithDelta(-0.20360200000000001, $result->getCoordinates()->getLongitude(), 0.01);
7575
$this->assertEquals('Acklam Road', $result->getStreetName());
7676
$this->assertEquals('Londres', $result->getLocality());
7777
$this->assertEquals('Royaume-Uni', $result->getCountry()->getName());
@@ -92,51 +92,47 @@ public function testReverseWithRealCoordinates()
9292
/** @var \Geocoder\Model\Address $result */
9393
$result = $results->get(1);
9494
$this->assertInstanceOf('\Geocoder\Model\Address', $result);
95-
$this->assertEquals(54.048411999999999, $result->getCoordinates()->getLatitude(), '', 0.001);
96-
$this->assertEquals(-2.7989549999999999, $result->getCoordinates()->getLongitude(), '', 0.001);
95+
$this->assertEqualsWithDelta(54.048411999999999, $result->getCoordinates()->getLatitude(), 0.001);
96+
$this->assertEqualsWithDelta(-2.7989549999999999, $result->getCoordinates()->getLongitude(), 0.001);
9797
$this->assertEquals('1', $result->getStreetNumber());
9898
$this->assertEquals('Gage Street', $result->getStreetName());
9999
$this->assertEquals('LA1 1UH', $result->getPostalCode());
100100
$this->assertEquals('Lancaster', $result->getLocality());
101101
$this->assertEquals('United Kingdom', $result->getCountry()->getName());
102102
}
103103

104-
/**
105-
* @expectedException \Geocoder\Exception\UnsupportedOperation
106-
* @expectedExceptionMessage The GraphHopper provider does not support IP addresses, only street addresses.
107-
*/
108104
public function testGeocodeWithLocalhostIPv4()
109105
{
106+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
107+
$this->expectExceptionMessage('The GraphHopper provider does not support IP addresses, only street addresses.');
108+
110109
$provider = new GraphHopper($this->getMockedHttpClient(), 'api_key');
111110
$provider->geocodeQuery(GeocodeQuery::create('127.0.0.1'));
112111
}
113112

114-
/**
115-
* @expectedException \Geocoder\Exception\UnsupportedOperation
116-
* @expectedExceptionMessage The GraphHopper provider does not support IP addresses, only street addresses.
117-
*/
118113
public function testGeocodeWithLocalhostIPv6()
119114
{
115+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
116+
$this->expectExceptionMessage('The GraphHopper provider does not support IP addresses, only street addresses.');
117+
120118
$provider = new GraphHopper($this->getMockedHttpClient(), 'api_key');
121119
$provider->geocodeQuery(GeocodeQuery::create('::1'));
122120
}
123121

124-
/**
125-
* @expectedException \Geocoder\Exception\UnsupportedOperation
126-
* @expectedExceptionMessage The GraphHopper provider does not support IP addresses, only street addresses.
127-
*/
128122
public function testGeocodeWithRealIPv4()
129123
{
124+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
125+
$this->expectExceptionMessage('The GraphHopper provider does not support IP addresses, only street addresses.');
126+
130127
$provider = new GraphHopper($this->getMockedHttpClient(), 'api_key');
131128
$provider->geocodeQuery(GeocodeQuery::create('74.200.247.59'));
132129
}
133130

134-
/**
135-
* @expectedException \Geocoder\Exception\UnsupportedOperation
136-
* @expectedExceptionMessage The GraphHopper provider does not support IP addresses, only street addresses.
137-
*/
138131
public function testGeocodeWithRealIPv6()
139132
{
133+
$this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
134+
$this->expectExceptionMessage('The GraphHopper provider does not support IP addresses, only street addresses.');
135+
140136
$provider = new GraphHopper($this->getMockedHttpClient(), 'api_key');
141137
$provider->geocodeQuery(GeocodeQuery::create('::ffff:74.200.247.59'));
142138
}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"homepage": "http://geocoder-php.org/Geocoder/",
77
"license": "MIT",
88
"require": {
9-
"php": "^7.2",
9+
"php": "^7.3 || ^8.0",
1010
"geocoder-php/common-http": "^4.0",
1111
"willdurand/geocoder": "^4.0"
1212
},

0 commit comments

Comments
 (0)