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

Author: jbelien

Tests/Dumper/GeoArrayTest.php

@@ -26,7 +26,7 @@ class GeoArrayTest extends TestCase
      */
     private $dumper;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->dumper = new GeoArray();
     }
@@ -47,7 +47,7 @@ public function testDump()
 
         $result = $this->dumper->dump($address);
 
-        $this->assertInternalType('array', $result);
+        $this->assertIsArray($result);
         $this->assertEquals($expected, $result);
     }
 
@@ -71,7 +71,7 @@ public function testDumpWithData()
 
         $result = $this->dumper->dump($address);
 
-        $this->assertInternalType('array', $result);
+        $this->assertIsArray($result);
         $this->assertEquals($expected, $result);
     }
 
@@ -107,7 +107,7 @@ public function testDumpWithBounds()
 
         $result = $this->dumper->dump($address);
 
-        $this->assertInternalType('array', $result);
+        $this->assertIsArray($result);
         $this->assertEquals($expected, $result);
     }
 
@@ -147,7 +147,7 @@ public function testDumpWithProperties()
 
         $result = $this->dumper->dump($address);
 
-        $this->assertInternalType('array', $result);
+        $this->assertIsArray($result);
         $this->assertEquals($expected, $result);
     }
 }

Tests/Dumper/GeoJsonTest.php

@@ -27,7 +27,7 @@ class GeoJsonTest extends TestCase
      */
     private $dumper;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->dumper = new GeoJson();
     }

Tests/Dumper/GpxTest.php

@@ -27,7 +27,7 @@ class GpxTest extends TestCase
      */
     private $dumper;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->dumper = new Gpx();
     }

Tests/Dumper/KmlTest.php

@@ -27,7 +27,7 @@ class KmlTest extends TestCase
      */
     private $dumper;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->dumper = new Kml();
     }

Tests/Dumper/WkbTest.php

@@ -27,7 +27,7 @@ class WkbTest extends TestCase
      */
     private $dumper;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->dumper = new Wkb();
     }

Tests/Dumper/WktTest.php

@@ -27,7 +27,7 @@ class WktTest extends TestCase
      */
     private $dumper;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->dumper = new Wkt();
     }

Tests/Formatter/StringFormatterTest.php

@@ -26,7 +26,7 @@ class StringFormatterTest extends TestCase
      */
     private $formatter;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->formatter = new StringFormatter();
     }

Tests/Model/AddressCollectionTest.php

@@ -25,6 +25,8 @@ class AddressCollectionTest extends TestCase
      */
     public function testFirstOnEmpty()
     {
+        $this->expectException(\Geocoder\Exception\CollectionIsEmpty::class);
+
         $collection = new AddressCollection([]);
         $collection->first();
     }

Tests/ProviderAggregatorTest.php

@@ -32,7 +32,7 @@ class ProviderAggregatorTest extends TestCase
      */
     protected $geocoder;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->geocoder = new ProviderAggregator();
     }
@@ -82,22 +82,20 @@ public function testRegisterProviders()
         $this->assertSame(['test' => $provider], NSA::getProperty($this->geocoder, 'providers'));
     }
 
-    /**
-     * @expectedException \Geocoder\Exception\ProviderNotRegistered
-     * @expectedExceptionMessage Provider "non_existant" is not registered, so you cannot use it. Did you forget to register it or made a typo? Registered providers are: test1.
-     */
     public function testUsingNonExistantProviderShouldThrowAnException()
     {
+        $this->expectException(\Geocoder\Exception\ProviderNotRegistered::class);
+        $this->expectExceptionMessage('Provider "non_existant" is not registered, so you cannot use it. Did you forget to register it or made a typo? Registered providers are: test1.');
+
         $this->geocoder->registerProvider(new MockProvider('test1'));
 
         $this->geocoder->using('non_existant');
     }
 
-    /**
-     * @expectedException \Geocoder\Exception\ProviderNotRegistered
-     */
     public function testUsingAnEmptyProviderNameShouldThrowAnException()
     {
+        $this->expectException(\Geocoder\Exception\ProviderNotRegistered::class);
+
         $this->geocoder->using('');
     }
 
@@ -119,11 +117,10 @@ public function testGetProviders()
         $this->assertArrayHasKey('test2', $result);
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testGetProvider()
     {
+        $this->expectException(\RuntimeException::class);
+
         NSA::invokeMethod($this->geocoder, 'getProvider', GeocodeQuery::create('foo'), [], null);
         $this->fail('getProvider() should throw an exception');
     }

Tests/Query/GeocodeQueryTest.php

@@ -26,10 +26,10 @@ public function testToString()
         $query = $query->withData('name', 'value');
 
         $string = $query->__toString();
-        $this->assertContains('GeocodeQuery', $string);
-        $this->assertContains('"text":"foo"', $string);
-        $this->assertContains('"locale":"en"', $string);
-        $this->assertContains('"limit":3', $string);
-        $this->assertContains('"name":"value"', $string);
+        $this->assertStringContainsString('GeocodeQuery', $string);
+        $this->assertStringContainsString('"text":"foo"', $string);
+        $this->assertStringContainsString('"locale":"en"', $string);
+        $this->assertStringContainsString('"limit":3', $string);
+        $this->assertStringContainsString('"name":"value"', $string);
     }
 }

Tests/Query/ReverseQueryTest.php

@@ -26,11 +26,11 @@ public function testToString()
         $query = $query->withData('name', 'value');
 
         $string = $query->__toString();
-        $this->assertContains('ReverseQuery', $string);
-        $this->assertContains('"lat":1', $string);
-        $this->assertContains('"lng":2', $string);
-        $this->assertContains('"locale":"en"', $string);
-        $this->assertContains('"limit":3', $string);
-        $this->assertContains('"name":"value"', $string);
+        $this->assertStringContainsString('ReverseQuery', $string);
+        $this->assertStringContainsString('"lat":1', $string);
+        $this->assertStringContainsString('"lng":2', $string);
+        $this->assertStringContainsString('"locale":"en"', $string);
+        $this->assertStringContainsString('"limit":3', $string);
+        $this->assertStringContainsString('"name":"value"', $string);
     }
 }

Tests/TimedGeocoderTest.php

@@ -35,7 +35,7 @@ class TimedGeocoderTest extends TestCase
      */
     private $geocoder;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->stopwatch = new Stopwatch();
         $this->delegate = $this->getMockBuilder(Provider::class)->getMock();

composer.json

@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "php": "^7.2"
+        "php": "^7.3 || ^8.0"
     },
     "require-dev": {
         "nyholm/nsa": "^1.1",