Skip to content

Commit 6ef3c32

Browse files
patrickghidossipatrickghidossi
authored
Merge branch 'geocoder-php:master' into GS7Update
2 parents f636bed + 8c76dd3 commit 6ef3c32

File tree

53 files changed

+102
-60
lines changed

Some content is hidden

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

53 files changed

+102
-60
lines changed

‎.github/workflows/component.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,17 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php-version: ['8.0', '8.1', '8.2', '8.3']
17+
php-version: ['8.2', '8.3', '8.4']
1818
component: [Common, Http, Plugin]
19+
include:
20+
- php-version: '8.0'
21+
component: Http
22+
- php-version: '8.0'
23+
component: Plugin
24+
- php-version: '8.1'
25+
component: Http
26+
- php-version: '8.1'
27+
component: Plugin
1928

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

‎.github/workflows/php.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
php-version: ['8.0', '8.1', '8.2', '8.3']
15+
php-version: ['8.2', '8.3', '8.4']
1616
deps: ['low', 'high']
1717
name: PHP ${{ matrix.php-version }} (${{ matrix.deps }})
1818
steps:
@@ -63,5 +63,5 @@ jobs:
6363
extensions: curl
6464
- name: Install dependencies
6565
run: composer install --no-progress
66-
- name: Run PHPStan
66+
- name: Run php-cs-fixer
6767
run: composer run-script cs

‎.github/workflows/provider.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['8.0', '8.1', '8.2', '8.3']
16+
php-version: ['8.0', '8.1', '8.2', '8.3', '8.4']
1717
provider:
1818
- AlgoliaPlaces
1919
- ArcGISOnline

‎.github/workflows/subtree.yml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,15 @@ jobs:
1919
name: Subtree for Common
2020
runs-on: ubuntu-latest
2121
steps:
22+
- uses: actions/create-github-app-token@v1
23+
id: app-token
24+
with:
25+
app-id: ${{ vars.SUBTREE_APP_ID }}
26+
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
27+
owner: ${{ github.repository_owner }}
2228
- uses: actions/checkout@v4
2329
with:
24-
token: ${{ secrets.SUBTREE_GITHUB_TOKEN }}
30+
token: ${{ steps.app-token.outputs.token }}
2531
fetch-depth: 0
2632
- name: Subtree Split
2733
uses: ./.github/actions/subtree
@@ -33,9 +39,15 @@ jobs:
3339
name: Subtree for Http
3440
runs-on: ubuntu-latest
3541
steps:
42+
- uses: actions/create-github-app-token@v1
43+
id: app-token
44+
with:
45+
app-id: ${{ vars.SUBTREE_APP_ID }}
46+
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
47+
owner: ${{ github.repository_owner }}
3648
- uses: actions/checkout@v4
3749
with:
38-
token: ${{ secrets.SUBTREE_GITHUB_TOKEN }}
50+
token: ${{ steps.app-token.outputs.token }}
3951
fetch-depth: 0
4052
- name: Subtree Split
4153
uses: ./.github/actions/subtree
@@ -47,9 +59,15 @@ jobs:
4759
name: Subtree for Plugin
4860
runs-on: ubuntu-latest
4961
steps:
62+
- uses: actions/create-github-app-token@v1
63+
id: app-token
64+
with:
65+
app-id: ${{ vars.SUBTREE_APP_ID }}
66+
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
67+
owner: ${{ github.repository_owner }}
5068
- uses: actions/checkout@v4
5169
with:
52-
token: ${{ secrets.SUBTREE_GITHUB_TOKEN }}
70+
token: ${{ steps.app-token.outputs.token }}
5371
fetch-depth: 0
5472
- name: Subtree Split
5573
uses: ./.github/actions/subtree
@@ -101,9 +119,15 @@ jobs:
101119
- { folder: TomTom, repository: tomtom-provider }
102120
- { folder: Yandex, repository: yandex-provider }
103121
steps:
122+
- uses: actions/create-github-app-token@v1
123+
id: app-token
124+
with:
125+
app-id: ${{ vars.SUBTREE_APP_ID }}
126+
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
127+
owner: ${{ github.repository_owner }}
104128
- uses: actions/checkout@v4
105129
with:
106-
token: ${{ secrets.SUBTREE_GITHUB_TOKEN }}
130+
token: ${{ steps.app-token.outputs.token }}
107131
fetch-depth: 0
108132
- name: Subtree Split
109133
uses: ./.github/actions/subtree

‎CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# CHANGELOG
22

3-
## 4.4.0 (2023-??-??)
3+
## 5.0.0 (2025-01-01)
44

5+
* Removed: Support for PHP < 8.2
6+
* Added: Support for PHP 8.2, 8.3, 8.4
57
* Added: Method `AbstractHttpProvider::createRequest()`
6-
* Deprecated: Method `AbstractHttpProvider::getMessageFactory()`
8+
* Added: PHPStan Level 6
9+
* Changed: Method `AbstractHttpProvider::getMessageFactory()` is now deprecated
10+
* Changed: Run "Subtree Split" using GitHub Actions
711

812
## 4.3.0 (2022-07-30)
913

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"homepage": "http://geocoder-php.org",
1919
"require": {
20-
"php": "^8.0",
20+
"php": ">=8.2",
2121
"igorw/get-in": "^1.0",
2222
"php-http/discovery": "^1.17",
2323
"php-http/promise": "^1.0",
@@ -42,7 +42,7 @@
4242
"phpstan/phpstan": "^1.10",
4343
"phpstan/phpstan-phpunit": "^1.3",
4444
"phpunit/phpunit": "^9.6",
45-
"symfony/http-client": "^5.4 || ^6.4 || ^7.0",
45+
"symfony/http-client": "^5.4.45 || ^6.4 || ^7.0",
4646
"symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
4747
},
4848
"suggest": {

‎src/Common/.github/workflows/component.yml

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

‎src/Common/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release.
44

5+
## 5.0.0
6+
7+
- Drop support for PHP < 8.2
8+
- Added return values on classes and interfaces
9+
510
## 4.6.0
611

712
### Removed

‎src/Common/Model/Address.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ final public function __construct(
8585
?string $locality = null,
8686
?string $subLocality = null,
8787
?Country $country = null,
88-
?string $timezone = null
88+
?string $timezone = null,
8989
) {
9090
$this->providedBy = $providedBy;
9191
$this->adminLevels = $adminLevels;

‎src/Common/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
}
1818
],
1919
"require": {
20-
"php": "^8.0"
20+
"php": ">=8.2"
2121
},
2222
"require-dev": {
2323
"nyholm/nsa": "^1.1",
@@ -29,7 +29,7 @@
2929
},
3030
"extra": {
3131
"branch-alias": {
32-
"dev-master": "4.1-dev"
32+
"dev-master": "5.1-dev"
3333
}
3434
},
3535
"autoload": {
@@ -49,4 +49,4 @@
4949
"php-http/discovery": false
5050
}
5151
}
52-
}
52+
}

0 commit comments

Comments
 (0)