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
geocoder-php · Dec 19, 2020 · d85dd9c · d85dd9c
1 parent de44e1c
commit d85dd9c
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 33 deletions.
diff --git a/Tests/HostIpTest.php b/Tests/HostIpTest.php
@@ -31,12 +31,11 @@ public function testGetName()
         $this->assertEquals('host_ip', $provider->getName());
     }
 
-    /**
-     * @expectedException \Geocoder\Exception\UnsupportedOperation
-     * @expectedExceptionMessage The Geocoder\Provider\HostIp\HostIp provider does not support Street addresses.
-     */
     public function testGeocodeWithAddress()
     {
+        $this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
+        $this->expectExceptionMessage('The Geocoder\Provider\HostIp\HostIp provider does not support Street addresses.');
+
         $provider = new HostIp($this->getMockedHttpClient());
         $provider->geocodeQuery(GeocodeQuery::create('10 avenue Gambetta, Paris, France'));
     }
@@ -62,12 +61,11 @@ public function testGeocodeWithLocalhostIPv4()
         $this->assertEquals('localhost', $result->getCountry()->getName());
     }
 
-    /**
-     * @expectedException \Geocoder\Exception\UnsupportedOperation
-     * @expectedExceptionMessage The HostIp provider does not support IPv6 addresses.
-     */
     public function testGeocodeWithLocalhostIPv6()
     {
+        $this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
+        $this->expectExceptionMessage('The HostIp provider does not support IPv6 addresses.');
+
         $provider = new HostIp($this->getMockedHttpClient());
         $provider->geocodeQuery(GeocodeQuery::create('::1'));
     }
@@ -91,22 +89,20 @@ public function testGeocodeWithRealIPv4()
         $this->assertEquals('FR', $result->getCountry()->getCode());
     }
 
-    /**
-     * @expectedException \Geocoder\Exception\UnsupportedOperation
-     * @expectedExceptionMessage The HostIp provider does not support IPv6 addresses.
-     */
     public function testGeocodeWithRealIPv6()
     {
+        $this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
+        $this->expectExceptionMessage('The HostIp provider does not support IPv6 addresses.');
+
         $provider = new HostIp($this->getHttpClient());
         $provider->geocodeQuery(GeocodeQuery::create('::ffff:88.188.221.14'));
     }
 
-    /**
-     * @expectedException \Geocoder\Exception\UnsupportedOperation
-     * @expectedExceptionMessage The HostIp provider is not able to do reverse geocoding.
-     */
     public function testReverse()
     {
+        $this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
+        $this->expectExceptionMessage('The HostIp provider is not able to do reverse geocoding.');
+
         $provider = new HostIp($this->getMockedHttpClient());
         $provider->reverseQuery(ReverseQuery::fromCoordinates(1, 2));
     }

diff --git a/Tests/HostIpXmlTest.php b/Tests/HostIpXmlTest.php
@@ -31,12 +31,11 @@ public function testGetName()
         $this->assertEquals('host_ip_xml', $provider->getName());
     }
 
-    /**
-     * @expectedException \Geocoder\Exception\UnsupportedOperation
-     * @expectedExceptionMessage The Geocoder\Provider\HostIp\HostIpXml provider does not support Street addresses.
-     */
     public function testGeocodeWithAddress()
     {
+        $this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
+        $this->expectExceptionMessage('The Geocoder\Provider\HostIp\HostIpXml provider does not support Street addresses.');
+
         $provider = new HostIpXml($this->getMockedHttpClient());
         $provider->geocodeQuery(GeocodeQuery::create('10 avenue Gambetta, Paris, France'));
     }
@@ -62,12 +61,11 @@ public function testGeocodeWithLocalhostIPv4()
         $this->assertEquals('localhost', $result->getCountry()->getName());
     }
 
-    /**
-     * @expectedException \Geocoder\Exception\UnsupportedOperation
-     * @expectedExceptionMessage The HostIp provider does not support IPv6 addresses.
-     */
     public function testGeocodeWithLocalhostIPv6()
     {
+        $this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
+        $this->expectExceptionMessage('The HostIp provider does not support IPv6 addresses.');
+
         $provider = new HostIpXml($this->getMockedHttpClient());
         $provider->geocodeQuery(GeocodeQuery::create('::1'));
     }
@@ -92,22 +90,20 @@ public function testGeocodeWithRealIPv4()
         $this->assertEquals('LV', $result->getCountry()->getCode());
     }
 
-    /**
-     * @expectedException \Geocoder\Exception\UnsupportedOperation
-     * @expectedExceptionMessage The HostIp provider does not support IPv6 addresses.
-     */
     public function testGeocodeWithRealIPv6()
     {
+        $this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
+        $this->expectExceptionMessage('The HostIp provider does not support IPv6 addresses.');
+
         $provider = new HostIpXml($this->getHttpClient());
         $provider->geocodeQuery(GeocodeQuery::create('::ffff:88.188.221.14'));
     }
 
-    /**
-     * @expectedException \Geocoder\Exception\UnsupportedOperation
-     * @expectedExceptionMessage The HostIp provider is not able to do reverse geocoding.
-     */
     public function testReverse()
     {
+        $this->expectException(\Geocoder\Exception\UnsupportedOperation::class);
+        $this->expectExceptionMessage('The HostIp provider is not able to do reverse geocoding.');
+
         $provider = new HostIpXml($this->getMockedHttpClient());
         $provider->reverseQuery(ReverseQuery::fromCoordinates(1, 2));
     }

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.3 || ^8.0",
         "geocoder-php/common-http": "^4.0",
         "willdurand/geocoder": "^4.0"
     },