Skip to content

Commit 11ccbc4

Browse files
committed
Minor syntax fixes
1 parent 990ab98 commit 11ccbc4

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

src/Geocoder/Formatter/StringFormatter.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class StringFormatter
4949
*/
5050
public function format(Address $address, $format)
5151
{
52-
$tr = [
52+
$replace = [
5353
self::STREET_NUMBER => $address->getStreetNumber(),
5454
self::STREET_NAME => $address->getStreetName(),
5555
self::LOCALITY => $address->getLocality(),
@@ -60,16 +60,16 @@ public function format(Address $address, $format)
6060
self::TIMEZONE => $address->getTimezone(),
6161
];
6262

63-
for ($level = 1; $level <= AdminLevelCollection::MAX_LEVEL_DEPTH; ++ $level) {
64-
$tr[self::ADMIN_LEVEL . $level] = null;
65-
$tr[self::ADMIN_LEVEL_CODE . $level] = null;
63+
for ($level = 1; $level <= AdminLevelCollection::MAX_LEVEL_DEPTH; $level ++) {
64+
$replace[self::ADMIN_LEVEL . $level] = null;
65+
$replace[self::ADMIN_LEVEL_CODE . $level] = null;
6666
}
6767

6868
foreach ($address->getAdminLevels() as $level => $adminLevel) {
69-
$tr[self::ADMIN_LEVEL . $level] = $adminLevel->getName();
70-
$tr[self::ADMIN_LEVEL_CODE . $level] = $adminLevel->getCode();
69+
$replace[self::ADMIN_LEVEL . $level] = $adminLevel->getName();
70+
$replace[self::ADMIN_LEVEL_CODE . $level] = $adminLevel->getCode();
7171
}
7272

73-
return strtr($format, $tr);
73+
return strtr($format, $replace);
7474
}
7575
}

src/Geocoder/Provider/GeoIPs.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,18 @@ private function executeQuery($query)
172172
$adminLevels = [];
173173

174174
if (null !== $location['region_name'] || null !== $location['region_code']) {
175-
$adminLevels[] = ['name' => $location['region_name'], 'code' => $location['region_code'], 'level' => 1];
175+
$adminLevels[] = [
176+
'name' => $location['region_name'],
177+
'code' => $location['region_code'],
178+
'level' => 1
179+
];
176180
}
177181

178182
if (null !== $location['county_name']) {
179-
$adminLevels[] = ['name' => $location['county_name'], 'level' => 2];
183+
$adminLevels[] = [
184+
'name' => $location['county_name'],
185+
'level' => 2
186+
];
180187
}
181188

182189
$results = [];

0 commit comments

Comments
 (0)