Skip to content

Commit dc38d1c

Browse files
authored
Merge branch 'geocoder-php:master' into zero0cool0-fix-locationiq
2 parents c6cd043 + 432f5bd commit dc38d1c

7 files changed

Lines changed: 14 additions & 16 deletions

File tree

‎.github/workflows/component.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
name: PHP ${{ matrix.php-version }} / ${{ matrix.component }}
3030

3131
steps:
32-
- uses: actions/checkout@v6
32+
- uses: actions/checkout@v7
3333

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

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
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@v6
18+
uses: actions/checkout@v7
1919
- name: 'Dependency Review'
2020
uses: actions/dependency-review-action@v5

‎.github/workflows/php.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
deps: ['low', 'high']
1717
name: PHP ${{ matrix.php-version }} (${{ matrix.deps }})
1818
steps:
19-
- uses: actions/checkout@v6
19+
- uses: actions/checkout@v7
2020
- name: Use PHP ${{ matrix.php-version }}
2121
uses: shivammathur/setup-php@v2
2222
with:
@@ -40,7 +40,7 @@ jobs:
4040
runs-on: ubuntu-latest
4141
name: PHPStan
4242
steps:
43-
- uses: actions/checkout@v6
43+
- uses: actions/checkout@v7
4444
- name: Use PHP 8.3
4545
uses: shivammathur/setup-php@v2
4646
with:
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656
name: PHP CS Fixer
5757
steps:
58-
- uses: actions/checkout@v6
58+
- uses: actions/checkout@v7
5959
- name: Use PHP 8.3
6060
uses: shivammathur/setup-php@v2
6161
with:

‎.github/workflows/provider.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- TomTom
5353
- Yandex
5454
steps:
55-
- uses: actions/checkout@v6
55+
- uses: actions/checkout@v7
5656
- name: Use PHP ${{ matrix.php-version }}
5757
uses: shivammathur/setup-php@v2
5858
with:

‎.github/workflows/subtree.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
app-id: ${{ vars.SUBTREE_APP_ID }}
2626
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
2727
owner: ${{ github.repository_owner }}
28-
- uses: actions/checkout@v6
28+
- uses: actions/checkout@v7
2929
with:
3030
token: ${{ steps.app-token.outputs.token }}
3131
fetch-depth: 0
@@ -45,7 +45,7 @@ jobs:
4545
app-id: ${{ vars.SUBTREE_APP_ID }}
4646
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
4747
owner: ${{ github.repository_owner }}
48-
- uses: actions/checkout@v6
48+
- uses: actions/checkout@v7
4949
with:
5050
token: ${{ steps.app-token.outputs.token }}
5151
fetch-depth: 0
@@ -65,7 +65,7 @@ jobs:
6565
app-id: ${{ vars.SUBTREE_APP_ID }}
6666
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
6767
owner: ${{ github.repository_owner }}
68-
- uses: actions/checkout@v6
68+
- uses: actions/checkout@v7
6969
with:
7070
token: ${{ steps.app-token.outputs.token }}
7171
fetch-depth: 0
@@ -126,7 +126,7 @@ jobs:
126126
app-id: ${{ vars.SUBTREE_APP_ID }}
127127
private-key: ${{ secrets.SUBTREE_APP_PRIVATE_KEY }}
128128
owner: ${{ github.repository_owner }}
129-
- uses: actions/checkout@v6
129+
- uses: actions/checkout@v7
130130
with:
131131
token: ${{ steps.app-token.outputs.token }}
132132
fetch-depth: 0

‎src/Provider/IP2Location/IP2Location.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,8 @@ private function executeQuery(string $url): AddressCollection
102102
throw new InvalidCredentials('Insufficient credits to use IP2Location service.');
103103
} elseif (preg_match('/invalid ip address/i', $data['response'])) {
104104
throw new UnsupportedOperation('Invalid IP address.');
105-
} else {
106-
throw new UnsupportedOperation(sprintf('Unexpected error: %s.', $data['response']));
107105
}
106+
throw new UnsupportedOperation(sprintf('Unexpected error: %s.', $data['response']));
108107
}
109108

110109
if (isset($data['region_name'])) {

‎src/Provider/MapQuest/MapQuest.php‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,10 @@ public function geocodeQuery(GeocodeQuery $query): Collection
157157
$params = $this->addOptionsForGetQuery($params, $options);
158158

159159
return $this->executeGetQuery(static::GEOCODE_ENDPOINT, $params);
160-
} else {
161-
$params = $this->addOptionsForPostQuery($params, $options);
162-
163-
return $this->executePostQuery(static::GEOCODE_ENDPOINT, $params);
164160
}
161+
$params = $this->addOptionsForPostQuery($params, $options);
162+
163+
return $this->executePostQuery(static::GEOCODE_ENDPOINT, $params);
165164
}
166165

167166
public function reverseQuery(ReverseQuery $query): Collection

0 commit comments

Comments
 (0)