Skip to content

Commit 6005943

Browse files
Chris53897Chris53897
authored
Merge branch 'master' into feature/fix-warning-for-tests
2 parents 44cec07 + 01d57d5 commit 6005943

File tree

48 files changed

+76
-52
lines changed

Some content is hidden

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

48 files changed

+76
-52
lines changed

‎.github/workflows/component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
php-version: ['8.0', '8.1', '8.2', '8.3']
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 }}

‎.github/workflows/php.yml

Lines changed: 1 addition & 1 deletion
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.0', '8.1', '8.2', '8.3', '8.4']
1616
deps: ['low', 'high']
1717
name: PHP ${{ matrix.php-version }} (${{ matrix.deps }})
1818
steps:

‎.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

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
"phpstan/extension-installer": "^1.3",
4242
"phpstan/phpstan": "^1.10",
4343
"phpstan/phpstan-phpunit": "^1.3",
44-
"phpunit/phpunit": "^9.6.17",
45-
"symfony/http-client": "^5.4 || ^6.4 || ^7.0",
44+
"phpunit/phpunit": "^9.6.21",
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.0', '8.1', '8.2', '8.3', '8.4']
1717
steps:
1818
- uses: actions/checkout@v4
1919
- name: Use PHP ${{ matrix.php-version }}

‎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/Http/.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.0', '8.1', '8.2', '8.3', '8.4']
1717
steps:
1818
- uses: actions/checkout@v4
1919
- name: Use PHP ${{ matrix.php-version }}

‎src/Plugin/.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.0', '8.1', '8.2', '8.3', '8.4']
1717
steps:
1818
- uses: actions/checkout@v4
1919
- name: Use PHP ${{ matrix.php-version }}

‎src/Provider/AlgoliaPlaces/.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
steps:
1818
- uses: actions/checkout@v4
1919
- name: Use PHP ${{ matrix.php-version }}

0 commit comments

Comments
 (0)