Add PHP 8.0 support + Drop PHP < 7.3 support (#17)

jbelien · web-flow · commit 19cf45b3c201 · 2020-12-18T17:29:29.000+01:00
* Support PHP 8.0 + Upgrade PHPUnit

* Add GitHub Actions

* Update GitHub Actions

* Migrate from Google Maps to Nominatim since Google Maps doesn't allow keyless access anymore

* Update ProviderIntegrationTest.php

Update assert functions.

* Update GitHub Actions

Disable cache.

* Update GitHub Actions

* Disable fail-fast for GitHub Actions

* Run PHPUnit directly (without composer script)
diff --git a/.cached_responses/maps.googleapis.com_232e58df426ff2103395e35d8dc5dbcec523b150 b/.cached_responses/maps.googleapis.com_232e58df426ff2103395e35d8dc5dbcec523b150
diff --git a/.cached_responses/maps.googleapis.com_44b980ad45f14ab6d7772d511fbf445e61d2ae22 b/.cached_responses/maps.googleapis.com_44b980ad45f14ab6d7772d511fbf445e61d2ae22
diff --git a/.cached_responses/maps.googleapis.com_56a86eba9a0b3b14e39bc8c0b13a5ebb4a017803 b/.cached_responses/maps.googleapis.com_56a86eba9a0b3b14e39bc8c0b13a5ebb4a017803
diff --git a/.cached_responses/maps.googleapis.com_6cdb29002e6540693ed8a9215a280738e1dd8ac6 b/.cached_responses/maps.googleapis.com_6cdb29002e6540693ed8a9215a280738e1dd8ac6
diff --git a/.cached_responses/nominatim.openstreetmap.org_0b7c89ad04ee5a2d884a2fb4b718a1d54ff09d87 b/.cached_responses/nominatim.openstreetmap.org_0b7c89ad04ee5a2d884a2fb4b718a1d54ff09d87
@@ -0,0 +1 @@
+s:1596:"[{"place_id":259070493,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"relation","osm_id":1879842,"boundingbox":["51.5032573","51.5036483","-0.1278356","-0.1273038"],"lat":"51.50344025","lon":"-0.12770820958562096","display_name":"Prime Minister’s Office, 10, Downing Street, Westminster, Covent Garden, Westminster, London, Greater London, England, SW1A 2AA, United Kingdom","place_rank":30,"category":"tourism","type":"attraction","importance":0.9187064122051384,"icon":"https://nominatim.openstreetmap.org/ui/mapicons//poi_point_of_interest.p.20.png","address":{"tourism":"Prime Minister’s Office","house_number":"10","road":"Downing Street","quarter":"Westminster","suburb":"Covent Garden","city":"Westminster","state_district":"Greater London","state":"England","postcode":"SW1A 2AA","country":"United Kingdom","country_code":"gb"}},{"place_id":18621002,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":1931404517,"boundingbox":["51.5032302","51.5033302","-0.1276858","-0.1275858"],"lat":"51.5032802","lon":"-0.1276358","display_name":"10, Downing Street, Westminster, Covent Garden, Westminster, London, Greater London, England, SW1, United Kingdom","place_rank":30,"category":"place","type":"house","importance":0.42099999999999993,"address":{"house_number":"10","road":"Downing Street","quarter":"Westminster","suburb":"Covent Garden","city":"Westminster","state_district":"Greater London","state":"England","postcode":"SW1","country":"United Kingdom","country_code":"gb"}}]";
diff --git a/.cached_responses/nominatim.openstreetmap.org_7bc67c1f5d09c8956972d7bac599ad32378be808 b/.cached_responses/nominatim.openstreetmap.org_7bc67c1f5d09c8956972d7bac599ad32378be808
@@ -0,0 +1 @@
+s:29:"{"error":"Unable to geocode"}";
diff --git a/.cached_responses/nominatim.openstreetmap.org_e52647a4ee81d8138eb99f6c112982f37b855f91 b/.cached_responses/nominatim.openstreetmap.org_e52647a4ee81d8138eb99f6c112982f37b855f91
@@ -0,0 +1 @@
+s:736:"{"place_id":3029686,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":367142942,"lat":"38.9003895","lon":"-77.0374769","place_rank":30,"category":"building","type":"public","importance":0,"addresstype":"building","name":"United States Chamber of Commerce Building","display_name":"United States Chamber of Commerce Building, H Street Northwest, Washington, Washington, D.C., 20006, United States","address":{"building":"United States Chamber of Commerce Building","road":"H Street Northwest","city":"Washington","state":"Washington, D.C.","postcode":"20006","country":"United States","country_code":"us"},"boundingbox":["38.9003395","38.9004395","-77.0375269","-77.0374269"]}";
diff --git a/.cached_responses/nominatim.openstreetmap.org_f8507c7e172266250167178dc127b0317c18c390 b/.cached_responses/nominatim.openstreetmap.org_f8507c7e172266250167178dc127b0317c18c390
@@ -0,0 +1 @@
+s:2:"[]";
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -0,0 +1,45 @@
+name: PHP Composer
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: ['7.3', '7.4', '8.0']
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Use PHP ${{ matrix.php-version }}
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-version }}
+        extensions: curl
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate
+
+    # - name: Cache Composer packages
+    #   id: composer-cache
+    #   uses: actions/cache@v2
+    #   with:
+    #     path: vendor
+    #     key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+    #     restore-keys: |
+    #       ${{ runner.os }}-php-
+
+    - name: Install dependencies
+      # if: steps.composer-cache.outputs.cache-hit != 'true'
+      run: composer update --prefer-dist --no-progress
+
+    - name: Run test suite
+      run: ./vendor/bin/phpunit
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 composer.lock
 vendor
+.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,9 @@ language: php
 sudo: false
 
 php:
-  - 7.2
+  - 7.3
+  - 7.4
+  - 8.0
 
 before_install:
   - echo "Disable xdebug" && phpenv config-rm xdebug.ini
diff --git a/composer.json b/composer.json
@@ -14,14 +14,14 @@
         }
     ],
     "require":     {
-        "php": "^7.1",
-        "phpunit/phpunit": "^7.5",
+        "php": "^7.3 || ^8.0",
+        "phpunit/phpunit": "^9.5",
         "php-http/mock-client": "^1.2",
-        "nyholm/psr7": "^1.0.0"
+        "nyholm/psr7": "^1.0"
     },
     "require-dev": {
-        "php-http/curl-client": "^1.7",
-        "geocoder-php/google-maps-provider": "^4.0"
+        "php-http/curl-client": "^2.2",
+        "geocoder-php/nominatim-provider": "^5.3"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,29 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+  backupGlobals="false"
   backupStaticAttributes="false"
   colors="true"
   convertErrorsToExceptions="true"
   convertNoticesToExceptions="true"
   convertWarningsToExceptions="true"
   processIsolation="false"
   stopOnFailure="false"
-  syntaxCheck="false"
   bootstrap="vendor/autoload.php"
   >
+  <coverage>
+    <include>
+      <directory>./</directory>
+    </include>
+    <exclude>
+      <directory>./tests</directory>
+      <directory>./vendor</directory>
+    </exclude>
+  </coverage>
   <testsuites>
-    <testsuite name="Google Maps">
-      <file>./tests/GoogleMapsTest.php</file>
+    <testsuite name="Nominatim">
+      <file>./tests/NominatimTest.php</file>
     </testsuite>
   </testsuites>
-
-  <filter>
-    <whitelist>
-      <directory>./</directory>
-      <exclude>
-        <directory>./tests</directory>
-        <directory>./vendor</directory>
-      </exclude>
-    </whitelist>
-  </filter>
 </phpunit>
diff --git a/src/ProviderIntegrationTest.php b/src/ProviderIntegrationTest.php
@@ -113,12 +113,12 @@ public function testGeocodeQuery()
 
         // Check Downing Street
         $location = $result->first();
-        $this->assertEquals(51.5033, $location->getCoordinates()->getLatitude(), 'Latitude should be in London', 0.1);
-        $this->assertEquals(-0.1276, $location->getCoordinates()->getLongitude(), 'Longitude should be in London', 0.1);
-        $this->assertContains('Downing', $location->getStreetName(), 'Street name should contain "Downing St"');
+        $this->assertEqualsWithDelta(51.5033, $location->getCoordinates()->getLatitude(), 0.1, 'Latitude should be in London');
+        $this->assertEqualsWithDelta(-0.1276, $location->getCoordinates()->getLongitude(), 0.1, 'Longitude should be in London');
+        $this->assertStringContainsString('Downing', $location->getStreetName(), 'Street name should contain "Downing St"');
 
         if (null !== $streetNumber = $location->getStreetNumber()) {
-            $this->assertContains('10', $streetNumber, 'Street number should contain "10"');
+            $this->assertStringContainsString('10', $streetNumber, 'Street number should contain "10"');
         }
     }
 
diff --git a/tests/NominatimTest.php b/tests/NominatimTest.php
@@ -11,20 +11,20 @@
 namespace Geocoder\IntegrationTest\Test;
 
 use Geocoder\IntegrationTest\ProviderIntegrationTest;
-use Geocoder\Provider\GoogleMaps\GoogleMaps;
+use Geocoder\Provider\Nominatim\Nominatim;
 use Http\Client\HttpClient;
 
 /**
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  */
-class GoogleMapsTest extends ProviderIntegrationTest
+class NominatimTest extends ProviderIntegrationTest
 {
     protected $testIpv4 = false;
     protected $testIpv6 = false;
 
     protected function createProvider(HttpClient $httpClient)
     {
-        return new GoogleMaps($httpClient);
+        return Nominatim::withOpenStreetMapServer($httpClient, 'Geocoder PHP/Nominatim Provider/Nominatim Test');
     }
 
     protected function getCacheDir()

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+s:1596:"[{"place_id":259070493,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"relation","osm_id":1879842,"boundingbox":["51.5032573","51.5036483","-0.1278356","-0.1273038"],"lat":"51.50344025","lon":"-0.12770820958562096","display_name":"Prime Minister’s Office, 10, Downing Street, Westminster, Covent Garden, Westminster, London, Greater London, England, SW1A 2AA, United Kingdom","place_rank":30,"category":"tourism","type":"attraction","importance":0.9187064122051384,"icon":"https://nominatim.openstreetmap.org/ui/mapicons//poi_point_of_interest.p.20.png","address":{"tourism":"Prime Minister’s Office","house_number":"10","road":"Downing Street","quarter":"Westminster","suburb":"Covent Garden","city":"Westminster","state_district":"Greater London","state":"England","postcode":"SW1A 2AA","country":"United Kingdom","country_code":"gb"}},{"place_id":18621002,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":1931404517,"boundingbox":["51.5032302","51.5033302","-0.1276858","-0.1275858"],"lat":"51.5032802","lon":"-0.1276358","display_name":"10, Downing Street, Westminster, Covent Garden, Westminster, London, Greater London, England, SW1, United Kingdom","place_rank":30,"category":"place","type":"house","importance":0.42099999999999993,"address":{"house_number":"10","road":"Downing Street","quarter":"Westminster","suburb":"Covent Garden","city":"Westminster","state_district":"Greater London","state":"England","postcode":"SW1","country":"United Kingdom","country_code":"gb"}}]";
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+s:736:"{"place_id":3029686,"licence":"Data © OpenStreetMap contributors, ODbL 1.0. https://osm.org/copyright","osm_type":"node","osm_id":367142942,"lat":"38.9003895","lon":"-77.0374769","place_rank":30,"category":"building","type":"public","importance":0,"addresstype":"building","name":"United States Chamber of Commerce Building","display_name":"United States Chamber of Commerce Building, H Street Northwest, Washington, Washington, D.C., 20006, United States","address":{"building":"United States Chamber of Commerce Building","road":"H Street Northwest","city":"Washington","state":"Washington, D.C.","postcode":"20006","country":"United States","country_code":"us"},"boundingbox":["38.9003395","38.9004395","-77.0375269","-77.0374269"]}";
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`composer.lock`
`2`	`2`	`vendor`
	`3`	`+.phpunit.result.cache`