Skip to content

Commit 9f2c557

Browse files
authored
Merge branch 'master' into photon-reverse-with-osm-filters
2 parents 256464e + 3066dd5 commit 9f2c557

File tree

9 files changed

+31
-13
lines changed

9 files changed

+31
-13
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', '8.4']
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', '8.4']
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

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: 1 addition & 1 deletion
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",

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', '8.4']
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/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
}
1818
],
1919
"require": {
20-
"php": "^8.0"
20+
"php": ">=8.2"
2121
},
2222
"require-dev": {
2323
"nyholm/nsa": "^1.1",
2424
"phpunit/phpunit": "^9.5",
25-
"symfony/stopwatch": "~2.5 || ~5.0"
25+
"symfony/stopwatch": "~2.5 || ~5.0 || ~7.0"
2626
},
2727
"suggest": {
2828
"symfony/stopwatch": "If you want to use the TimedGeocoder"
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+
}

src/Http/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"php-http/discovery": "^1.17",
1919
"psr/http-client-implementation": "^1.0",
2020
"psr/http-factory-implementation": "^1.0",
21-
"willdurand/geocoder": "^4.0"
21+
"willdurand/geocoder": "^4.0|^5.0"
2222
},
2323
"require-dev": {
2424
"nyholm/psr7": "^1.0",

src/Plugin/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
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",
21-
"willdurand/geocoder": "^4.0"
21+
"willdurand/geocoder": "^4.0|^5.0"
2222
},
2323
"require-dev": {
2424
"cache/void-adapter": "^1.0",

0 commit comments

Comments
 (0)