Skip to content

Commit 3face59

Browse files
authored
Removed dependency in igorw (#693)
1 parent e56aaab commit 3face59

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Dumper/Gpx.php

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,21 @@ protected function formatName(Location $address): string
7979
{
8080
$name = [];
8181
$array = $address->toArray();
82-
$attrs = [
83-
['streetNumber'],
84-
['streetName'],
85-
['postalCode'],
86-
['locality'],
87-
['adminLevels', 2, 'name'],
88-
['adminLevels', 1, 'name'],
89-
['country'],
90-
];
91-
92-
foreach ($attrs as $attr) {
93-
$name[] = \igorw\get_in($array, $attr);
82+
83+
foreach (['streetNumber', 'streetName', 'postalCode', 'locality'] as $attr) {
84+
$name[] = $array[$attr];
85+
}
86+
87+
if (isset($array['adminLevels'][2])) {
88+
$name[] = $array['adminLevels'][2]['name'];
9489
}
9590

91+
if (isset($array['adminLevels'][1])) {
92+
$name[] = $array['adminLevels'][1]['name'];
93+
}
94+
95+
$name[] = $array['country'];
96+
9697
return implode(', ', array_filter($name));
9798
}
9899
}

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.0",
16-
"igorw/get-in": "^1.0"
15+
"php": "^7.0"
1716
},
1817
"require-dev": {
1918
"phpunit/phpunit": "^6.1",

0 commit comments

Comments
 (0)