Skip to content

Commit e472786

Browse files
jbelienjbelien
authored
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.
1 parent 30ae77f commit e472786

File tree

86 files changed

+88
-162
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+88
-162
lines changed

Diff for: ‎.github/workflows/component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php-version: ['7.4', '8.0', '8.1', '8.2']
17+
php-version: ['8.0', '8.1', '8.2']
1818
component: [Common, Http, Plugin]
1919

2020
name: PHP ${{ matrix.php-version }} / ${{ matrix.component }}

Diff for: ‎.github/workflows/php.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
php-version: ['7.4', '8.0', '8.1', '8.2']
15+
php-version: ['8.0', '8.1', '8.2']
1616
deps: ['low', 'high']
1717
name: PHP ${{ matrix.php-version }} (${{ matrix.deps }})
1818
steps:

Diff for: ‎.github/workflows/provider.yml

+1-27
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
provider:
1818
- AlgoliaPlaces
1919
- ArcGISOnline
@@ -67,29 +67,3 @@ jobs:
6767
- name: Run test suite
6868
working-directory: ./src/Provider/${{ matrix.provider }}
6969
run: composer run-script test
70-
71-
test-ext-geoip:
72-
name: PHP ${{ matrix.php-version }} (geoip) / ${{ matrix.provider }}
73-
runs-on: ubuntu-latest
74-
strategy:
75-
fail-fast: false
76-
matrix:
77-
php-version: ['7.4']
78-
provider:
79-
- Geoip
80-
steps:
81-
- uses: actions/checkout@v3
82-
- name: Use PHP ${{ matrix.php-version }}
83-
uses: shivammathur/setup-php@v2
84-
with:
85-
php-version: ${{ matrix.php-version }}
86-
extensions: curl, geoip
87-
- name: Validate composer.json and composer.lock
88-
working-directory: ./src/Provider/${{ matrix.provider }}
89-
run: composer validate
90-
- name: Install dependencies
91-
working-directory: ./src/Provider/${{ matrix.provider }}
92-
run: composer update --no-progress
93-
- name: Run test suite
94-
working-directory: ./src/Provider/${{ matrix.provider }}
95-
run: composer run-script test

Diff for: ‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"homepage": "http://geocoder-php.org",
1919
"require": {
20-
"php": "^7.4 || ^8.0",
20+
"php": "^8.0",
2121
"igorw/get-in": "^1.0",
2222
"php-http/discovery": "^1.4",
2323
"php-http/message-factory": "^1.0.2",

Diff for: ‎src/Common/.github/workflows/component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Common/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
}
1818
],
1919
"require": {
20-
"php": "^7.4 || ^8.0"
20+
"php": "^8.0"
2121
},
2222
"require-dev": {
2323
"nyholm/nsa": "^1.1",

Diff for: ‎src/Http/.github/workflows/component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Http/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
],
1616
"require": {
17-
"php": "^7.4 || ^8.0",
17+
"php": "^8.0",
1818
"php-http/client-implementation": "^1.0",
1919
"php-http/discovery": "^1.6",
2020
"php-http/httplug": "^1.0 || ^2.0",

Diff for: ‎src/Plugin/.github/workflows/component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Plugin/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
],
1616
"require": {
17-
"php": "^7.4 || ^8.0",
17+
"php": "^8.0",
1818
"php-http/promise": "^1.0",
1919
"psr/log": "^1.0|^2.0|^3.0",
2020
"psr/simple-cache": "^1.0|^2.0|^3.0",

Diff for: ‎src/Provider/AlgoliaPlaces/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Provider/AlgoliaPlaces/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"ext-json": "*",
1717
"geocoder-php/common-http": "^4.1",
1818
"willdurand/geocoder": "^4.0"

Diff for: ‎src/Provider/ArcGISOnline/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Provider/ArcGISOnline/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"geocoder-php/common-http": "^4.0",
1717
"willdurand/geocoder": "^4.0"
1818
},

Diff for: ‎src/Provider/AzureMaps/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Provider/AzureMaps/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212

1313
"require": {
14-
"php": "^7.4 || ^8.0",
14+
"php": "^8.0",
1515
"geocoder-php/common-http": "^4.0",
1616
"willdurand/geocoder": "^4.0"
1717
},

Diff for: ‎src/Provider/BingMaps/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Provider/BingMaps/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"geocoder-php/common-http": "^4.0",
1717
"willdurand/geocoder": "^4.0"
1818
},

Diff for: ‎src/Provider/Cache/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Provider/Cache/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"psr/simple-cache": "^1.0|^2.0|^3.0",
1717
"willdurand/geocoder": "^4.0.0"
1818
},

Diff for: ‎src/Provider/Chain/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Provider/Chain/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"psr/log": "^1.0|^2.0|^3.0",
1717
"willdurand/geocoder": "^4.0"
1818
},

Diff for: ‎src/Provider/FreeGeoIp/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Provider/FreeGeoIp/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"geocoder-php/common-http": "^4.1",
1717
"willdurand/geocoder": "^4.0"
1818
},

Diff for: ‎src/Provider/GeoIP2/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Provider/GeoIP2/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"geoip2/geoip2": "~2.0",
1717
"willdurand/geocoder": "^4.0"
1818
},

Diff for: ‎src/Provider/GeoIPs/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"geocoder-php/common-http": "^4.0",
1717
"willdurand/geocoder": "^4.1"
1818
},

Diff for: ‎src/Provider/GeoPlugin/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Provider/GeoPlugin/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"geocoder-php/common-http": "^4.0",
1717
"igorw/get-in": "^1.0",
1818
"willdurand/geocoder": "^4.0"

Diff for: ‎src/Provider/GeocodeEarth/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Provider/GeocodeEarth/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"geocoder-php/common-http": "^4.0",
1717
"geocoder-php/pelias-provider": "^1.0",
1818
"willdurand/geocoder": "^4.0"

Diff for: ‎src/Provider/Geoip/.github/workflows/provider.yml

-33
This file was deleted.

Diff for: ‎src/Provider/Geoip/Readme.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE)
99

1010
This is the Geoip provider from the PHP Geocoder. This is a **READ ONLY** repository. See the
11-
[main repo](https://github.com/geocoder-php/Geocoder) for information and documentation.
11+
[main repo](https://github.com/geocoder-php/Geocoder) for information and documentation.
12+
13+
> **Warning**
14+
> This provider is deprecated. Please use the [Geoip2 provider](https://github.com/geocoder-php/geoip2-provider).
1215
1316
### Install
1417

@@ -18,5 +21,5 @@ composer require geocoder-php/geoip-provider
1821

1922
### Contribute
2023

21-
Contributions are very welcome! Send a pull request to the [main repository](https://github.com/geocoder-php/Geocoder) or
24+
Contributions are very welcome! Send a pull request to the [main repository](https://github.com/geocoder-php/Geocoder) or
2225
report any issues you find on the [issue tracker](https://github.com/geocoder-php/Geocoder/issues).

Diff for: ‎src/Provider/Geoip/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"ext-geoip": "*",
1717
"willdurand/geocoder": "^4.0"
1818
},

Diff for: ‎src/Provider/Geonames/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

Diff for: ‎src/Provider/Geonames/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.4 || ^8.0",
15+
"php": "^8.0",
1616
"geocoder-php/common-http": "^4.0",
1717
"willdurand/geocoder": "^4.0"
1818
},

Diff for: ‎src/Provider/GoogleMaps/.github/workflows/provider.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['7.4', '8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2']
1717
steps:
1818
- uses: actions/checkout@v3
1919
- name: Use PHP ${{ matrix.php-version }}

0 commit comments

Comments
 (0)