Drop support for PHP 7.4 (#1197)

* Remove PHP 7.4 * Remove remaining .travis.yml * Update CI for GeoIP * Deprecate Geoip provider geoip extension doesn't seem to be available in PHP 8.
geocoder-php · Jul 31, 2023 · e472786 · e472786
1 parent 30ae77f
commit e472786
Show file tree

Hide file tree

Showing 86 changed files with 88 additions and 162 deletions.
diff --git a/.github/workflows/component.yml b/.github/workflows/component.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
         component: [Common, Http, Plugin]
 
     name: PHP ${{ matrix.php-version }} / ${{ matrix.component }}

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
         deps: ['low', 'high']
     name: PHP ${{ matrix.php-version }} (${{ matrix.deps }})
     steps:

diff --git a/.github/workflows/provider.yml b/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
         provider:
           - AlgoliaPlaces
           - ArcGISOnline
@@ -67,29 +67,3 @@ jobs:
     - name: Run test suite
       working-directory: ./src/Provider/${{ matrix.provider }}
       run: composer run-script test
-
-  test-ext-geoip:
-    name: PHP ${{ matrix.php-version }} (geoip) / ${{ matrix.provider }}
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version: ['7.4']
-        provider:
-          - Geoip
-    steps:
-    - uses: actions/checkout@v3
-    - name: Use PHP ${{ matrix.php-version }}
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-version }}
-        extensions: curl, geoip
-    - name: Validate composer.json and composer.lock
-      working-directory: ./src/Provider/${{ matrix.provider }}
-      run: composer validate
-    - name: Install dependencies
-      working-directory: ./src/Provider/${{ matrix.provider }}
-      run: composer update --no-progress
-    - name: Run test suite
-      working-directory: ./src/Provider/${{ matrix.provider }}
-      run: composer run-script test
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     ],
     "homepage": "http://geocoder-php.org",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "igorw/get-in": "^1.0",
         "php-http/discovery": "^1.4",
         "php-http/message-factory": "^1.0.2",

diff --git a/src/Common/.github/workflows/component.yml b/src/Common/.github/workflows/component.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

diff --git a/src/Common/composer.json b/src/Common/composer.json
@@ -17,7 +17,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0"
+        "php": "^8.0"
     },
     "require-dev": {
         "nyholm/nsa": "^1.1",

diff --git a/src/Http/.github/workflows/component.yml b/src/Http/.github/workflows/component.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

diff --git a/src/Http/composer.json b/src/Http/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "php-http/client-implementation": "^1.0",
         "php-http/discovery": "^1.6",
         "php-http/httplug": "^1.0 || ^2.0",

diff --git a/src/Plugin/.github/workflows/component.yml b/src/Plugin/.github/workflows/component.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

diff --git a/src/Plugin/composer.json b/src/Plugin/composer.json
@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "php-http/promise": "^1.0",
         "psr/log": "^1.0|^2.0|^3.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",

diff --git a/src/Provider/AlgoliaPlaces/.github/workflows/provider.yml b/src/Provider/AlgoliaPlaces/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

diff --git a/src/Provider/AlgoliaPlaces/composer.json b/src/Provider/AlgoliaPlaces/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-json": "*",
         "geocoder-php/common-http": "^4.1",
         "willdurand/geocoder": "^4.0"

diff --git a/src/Provider/ArcGISOnline/.github/workflows/provider.yml b/src/Provider/ArcGISOnline/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

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

diff --git a/src/Provider/AzureMaps/.github/workflows/provider.yml b/src/Provider/AzureMaps/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

diff --git a/src/Provider/AzureMaps/composer.json b/src/Provider/AzureMaps/composer.json
@@ -11,7 +11,7 @@
     ],
 
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "geocoder-php/common-http": "^4.0",
         "willdurand/geocoder": "^4.0"
     },

diff --git a/src/Provider/BingMaps/.github/workflows/provider.yml b/src/Provider/BingMaps/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

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

diff --git a/src/Provider/Cache/.github/workflows/provider.yml b/src/Provider/Cache/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

diff --git a/src/Provider/Cache/composer.json b/src/Provider/Cache/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "psr/simple-cache": "^1.0|^2.0|^3.0",
         "willdurand/geocoder": "^4.0.0"
     },

diff --git a/src/Provider/Chain/.github/workflows/provider.yml b/src/Provider/Chain/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

diff --git a/src/Provider/Chain/composer.json b/src/Provider/Chain/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "psr/log": "^1.0|^2.0|^3.0",
         "willdurand/geocoder": "^4.0"
     },

diff --git a/src/Provider/FreeGeoIp/.github/workflows/provider.yml b/src/Provider/FreeGeoIp/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

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

diff --git a/src/Provider/GeoIP2/.github/workflows/provider.yml b/src/Provider/GeoIP2/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

diff --git a/src/Provider/GeoIP2/composer.json b/src/Provider/GeoIP2/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "geoip2/geoip2": "~2.0",
         "willdurand/geocoder": "^4.0"
     },

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

diff --git a/src/Provider/GeoPlugin/.github/workflows/provider.yml b/src/Provider/GeoPlugin/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

diff --git a/src/Provider/GeoPlugin/composer.json b/src/Provider/GeoPlugin/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "geocoder-php/common-http": "^4.0",
         "igorw/get-in": "^1.0",
         "willdurand/geocoder": "^4.0"

diff --git a/src/Provider/GeocodeEarth/.github/workflows/provider.yml b/src/Provider/GeocodeEarth/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

diff --git a/src/Provider/GeocodeEarth/composer.json b/src/Provider/GeocodeEarth/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "geocoder-php/common-http": "^4.0",
         "geocoder-php/pelias-provider": "^1.0",
         "willdurand/geocoder": "^4.0"

diff --git a/src/Provider/Geoip/.github/workflows/provider.yml b/src/Provider/Geoip/.github/workflows/provider.yml
diff --git a/src/Provider/Geoip/Readme.md b/src/Provider/Geoip/Readme.md
@@ -8,7 +8,10 @@
 [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
 
 This is the Geoip provider from the PHP Geocoder. This is a **READ ONLY** repository. See the
-[main repo](https://github.com/geocoder-php/Geocoder) for information and documentation. 
+[main repo](https://github.com/geocoder-php/Geocoder) for information and documentation.
+
+> **Warning**  
+> This provider is deprecated. Please use the [Geoip2 provider](https://github.com/geocoder-php/geoip2-provider).
 
 ### Install
 
@@ -18,5 +21,5 @@ composer require geocoder-php/geoip-provider
 
 ### Contribute
 
-Contributions are very welcome! Send a pull request to the [main repository](https://github.com/geocoder-php/Geocoder) or 
+Contributions are very welcome! Send a pull request to the [main repository](https://github.com/geocoder-php/Geocoder) or
 report any issues you find on the [issue tracker](https://github.com/geocoder-php/Geocoder/issues).
diff --git a/src/Provider/Geoip/composer.json b/src/Provider/Geoip/composer.json
@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.0",
         "ext-geoip": "*",
         "willdurand/geocoder": "^4.0"
     },

diff --git a/src/Provider/Geonames/.github/workflows/provider.yml b/src/Provider/Geonames/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}

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

diff --git a/src/Provider/GoogleMaps/.github/workflows/provider.yml b/src/Provider/GoogleMaps/.github/workflows/provider.yml
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1', '8.2']
+        php-version: ['8.0', '8.1', '8.2']
     steps:
     - uses: actions/checkout@v3
     - name: Use PHP ${{ matrix.php-version }}