Skip to content

Commit 0c334f3

Browse files
ybertybert
authored
Merge branch 'master' into photon-reverse-with-osm-filters
2 parents 724c11d + 01d57d5 commit 0c334f3

File tree

146 files changed

+546
-420
lines changed

Some content is hidden

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

146 files changed

+546
-420
lines changed

‎.github/workflows/component.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php-version: ['8.0', '8.1', '8.2']
17+
php-version: ['8.0', '8.1', '8.2', '8.3', '8.4']
1818
component: [Common, Http, Plugin]
1919

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

2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424

2525
- name: Use PHP ${{ matrix.php-version }}
2626
uses: shivammathur/setup-php@v2

‎.github/workflows/dependency-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: 'Checkout Repository'
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
- name: 'Dependency Review'
20-
uses: actions/dependency-review-action@v3
20+
uses: actions/dependency-review-action@v4

‎.github/workflows/php.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
php-version: ['8.0', '8.1', '8.2']
15+
php-version: ['8.0', '8.1', '8.2', '8.3', '8.4']
1616
deps: ['low', 'high']
1717
name: PHP ${{ matrix.php-version }} (${{ matrix.deps }})
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- name: Use PHP ${{ matrix.php-version }}
2121
uses: shivammathur/setup-php@v2
2222
with:
@@ -40,11 +40,11 @@ jobs:
4040
runs-on: ubuntu-latest
4141
name: PHPStan
4242
steps:
43-
- uses: actions/checkout@v3
44-
- name: Use PHP 8.2
43+
- uses: actions/checkout@v4
44+
- name: Use PHP 8.3
4545
uses: shivammathur/setup-php@v2
4646
with:
47-
php-version: 8.2
47+
php-version: 8.3
4848
extensions: curl
4949
- name: Install dependencies
5050
run: composer install --no-progress
@@ -55,13 +55,13 @@ jobs:
5555
runs-on: ubuntu-latest
5656
name: PHP CS Fixer
5757
steps:
58-
- uses: actions/checkout@v3
59-
- name: Use PHP 8.2
58+
- uses: actions/checkout@v4
59+
- name: Use PHP 8.3
6060
uses: shivammathur/setup-php@v2
6161
with:
62-
php-version: 8.2
62+
php-version: 8.3
6363
extensions: curl
6464
- name: Install dependencies
6565
run: composer install --no-progress
6666
- name: Run PHPStan
67-
run: composer run-script cs
67+
run: composer run-script cs

‎.github/workflows/provider.yml

Lines changed: 2 additions & 2 deletions
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']
16+
php-version: ['8.0', '8.1', '8.2', '8.3', '8.4']
1717
provider:
1818
- AlgoliaPlaces
1919
- ArcGISOnline
@@ -52,7 +52,7 @@ jobs:
5252
- TomTom
5353
- Yandex
5454
steps:
55-
- uses: actions/checkout@v3
55+
- uses: actions/checkout@v4
5656
- name: Use PHP ${{ matrix.php-version }}
5757
uses: shivammathur/setup-php@v2
5858
with:

‎.github/workflows/subtree.yml

Lines changed: 33 additions & 9 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/checkout@v3
22+
- uses: actions/create-github-app-token@v1
23+
id: app-token
2324
with:
24-
token: ${{ secrets.SUBTREE_GITHUB_TOKEN }}
25+
app-id: ${{ vars.SUBTREE_APP_ID }}
26+
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
27+
owner: ${{ github.repository_owner }}
28+
- uses: actions/checkout@v4
29+
with:
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:
36-
- uses: actions/checkout@v3
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 }}
48+
- 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:
50-
- uses: actions/checkout@v3
62+
- uses: actions/create-github-app-token@v1
63+
id: app-token
5164
with:
52-
token: ${{ secrets.SUBTREE_GITHUB_TOKEN }}
65+
app-id: ${{ vars.SUBTREE_APP_ID }}
66+
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
67+
owner: ${{ github.repository_owner }}
68+
- uses: actions/checkout@v4
69+
with:
70+
token: ${{ steps.app-token.outputs.token }}
5371
fetch-depth: 0
5472
- name: Subtree Split
5573
uses: ./.github/actions/subtree
@@ -82,7 +100,7 @@ jobs:
82100
- { folder: Here, repository: here-provider }
83101
- { folder: HostIp, repository: host-ip-provider }
84102
- { folder: IP2Location, repository: ip2location-provider }
85-
# - { folder: IP2LocationBinary, repository: ip2location-binary-provider }
103+
- { folder: IP2LocationBinary, repository: ip2location-binary-provider }
86104
- { folder: IpInfo, repository: ip-info-provider }
87105
- { folder: IpInfoDb, repository: ip-info-db-provider }
88106
- { folder: Ipstack, repository: ipstack-provider }
@@ -101,9 +119,15 @@ jobs:
101119
- { folder: TomTom, repository: tomtom-provider }
102120
- { folder: Yandex, repository: yandex-provider }
103121
steps:
104-
- uses: actions/checkout@v3
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 }}
128+
- 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: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CHANGELOG
22

3+
## 4.4.0 (2023-??-??)
4+
5+
* Added: Method `AbstractHttpProvider::createRequest()`
6+
* Deprecated: Method `AbstractHttpProvider::getMessageFactory()`
7+
38
## 4.3.0 (2022-07-30)
49

510
* Removed: Support for PHP 7.3

‎composer.json

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,31 @@
1919
"require": {
2020
"php": "^8.0",
2121
"igorw/get-in": "^1.0",
22-
"php-http/discovery": "^1.4",
23-
"php-http/message-factory": "^1.0.2",
22+
"php-http/discovery": "^1.17",
2423
"php-http/promise": "^1.0",
25-
"psr/http-client": "^1.0",
2624
"psr/http-client-implementation": "^1.0",
27-
"psr/http-message-implementation": "^1.0",
25+
"psr/http-factory-implementation": "^1.0",
2826
"psr/log": "^1.0 || ^2.0 || ^3.0",
2927
"psr/simple-cache": "^1.0 || ^2.0 || ^3.0"
3028
},
3129
"require-dev": {
3230
"cache/array-adapter": "^1.0",
3331
"cache/simple-cache-bridge": "^1.0",
3432
"cache/void-adapter": "^1.0",
35-
"geocoder-php/provider-integration-tests": "^1.6.2",
36-
"geoip2/geoip2": "~2.0",
33+
"geocoder-php/provider-integration-tests": "^1.6.3",
34+
"geoip2/geoip2": "^2.0|^3.0",
3735
"nyholm/nsa": "^1.1",
3836
"nyholm/psr7": "^1.0",
3937
"php-cs-fixer/shim": "^3.22",
40-
"php-http/curl-client": "^2.2",
4138
"php-http/message": "^1.0",
39+
"php-http/message-factory": "^1.0.2",
4240
"php-http/mock-client": "^1.0",
4341
"phpstan/extension-installer": "^1.3",
4442
"phpstan/phpstan": "^1.10",
4543
"phpstan/phpstan-phpunit": "^1.3",
46-
"phpunit/phpunit": "^9.5",
47-
"symfony/stopwatch": "~2.5 || ~5.0"
44+
"phpunit/phpunit": "^9.6",
45+
"symfony/http-client": "^5.4.45 || ^6.4 || ^7.0",
46+
"symfony/stopwatch": "^5.4 || ^6.4 || ^7.0"
4847
},
4948
"suggest": {
5049
"ext-geoip": "Enabling the geoip extension allows you to use the MaxMindProvider.",
@@ -72,7 +71,7 @@
7271
"config": {
7372
"allow-plugins": {
7473
"phpstan/extension-installer": true,
75-
"php-http/discovery": true
74+
"php-http/discovery": false
7675
},
7776
"sort-packages": true
7877
},

‎phpstan.neon

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ parameters:
77
excludePaths:
88
- **/vendor/**
99
treatPhpDocTypesAsCertain: false
10+
checkGenericClassInNonGenericObjectType: false

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
php-version: ['8.0', '8.1', '8.2']
16+
php-version: ['8.0', '8.1', '8.2', '8.3', '8.4']
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Use PHP ${{ matrix.php-version }}
2020
uses: shivammathur/setup-php@v2
2121
with:

‎src/Common/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function isEmpty(): bool;
3535
/**
3636
* @return Location[]
3737
*/
38-
public function slice(int $offset, int $length = null);
38+
public function slice(int $offset, ?int $length = null);
3939

4040
public function has(int $index): bool;
4141

0 commit comments

Comments
 (0)