Completed
Pull Request — master (#10)
by
unknown
01:25
created
src/Geolocation.php 3 patches
Doc Comments   -4 removed lines patch added patch discarded remove patch
@@ -127,11 +127,7 @@
 block discarded – undo
127 127
      * Get coordinates latitude/longitude
128 128
      *
129 129
      * @return array  The latitude/longitude coordinates
130
-     * @param  string $street[optional]
131 130
      * @param  string $streetNumber[optional]
132
-     * @param  string $city[optional]
133
-     * @param  string $zip[optional]
134
-     * @param  string $country[optional]
135 131
      */
136 132
     public function getCoordinates(
137 133
         $street = null,
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -42,16 +42,16 @@  discard block
 block discarded – undo
42 42
         }
43 43
 
44 44
         // define url
45
-        $url = ($this->https ? 'https://' : 'http://') . self::API_URL . '?';
45
+        $url = ($this->https ? 'https://' : 'http://').self::API_URL.'?';
46 46
 
47 47
         // add every parameter to the url
48
-        foreach ($parameters as $key => $value) $url .= $key . '=' . urlencode($value) . '&';
48
+        foreach ($parameters as $key => $value) $url .= $key.'='.urlencode($value).'&';
49 49
 
50 50
         // trim last &
51 51
         $url = trim($url, '&');
52 52
 
53 53
         if ($this->api_key) {
54
-            $url .= '&key=' . $this->api_key;
54
+            $url .= '&key='.$this->api_key;
55 55
         }
56 56
 
57 57
         // init curl
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 
112 112
         // define result
113 113
         $addressSuggestions = $this->doCall(array(
114
-            'latlng' => $latitude . ',' . $longitude,
114
+            'latlng' => $latitude.','.$longitude,
115 115
             'sensor' => 'false'
116 116
         ));
117 117
 
Please login to merge, or discard this patch.
Braces   +27 added lines, -9 removed lines patch added patch discarded remove patch
@@ -45,7 +45,9 @@  discard block
 block discarded – undo
45 45
         $url = ($this->https ? 'https://' : 'http://') . self::API_URL . '?';
46 46
 
47 47
         // add every parameter to the url
48
-        foreach ($parameters as $key => $value) $url .= $key . '=' . urlencode($value) . '&';
48
+        foreach ($parameters as $key => $value) {
49
+            $url .= $key . '=' . urlencode($value) . '&';
50
+        }
49 51
 
50 52
         // trim last &
51 53
         $url = trim($url, '&');
@@ -61,7 +63,9 @@  discard block
 block discarded – undo
61 63
         curl_setopt($curl, CURLOPT_URL, $url);
62 64
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
63 65
         curl_setopt($curl, CURLOPT_TIMEOUT, 10);
64
-        if (ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
66
+        if (ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) {
67
+            curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
68
+        }
65 69
 
66 70
         // execute
67 71
         $response = curl_exec($curl);
@@ -74,13 +78,17 @@  discard block
 block discarded – undo
74 78
         curl_close($curl);
75 79
 
76 80
         // we have errors
77
-        if ($errorNumber != '') throw new GeolocationException($errorMessage);
81
+        if ($errorNumber != '') {
82
+            throw new GeolocationException($errorMessage);
83
+        }
78 84
 
79 85
         // redefine response as json decoded
80 86
         $response = json_decode($response);
81 87
 
82 88
         // API returns with an error
83
-        if (isset($response->error_message)) throw new GeolocationException($response->error_message);
89
+        if (isset($response->error_message)) {
90
+            throw new GeolocationException($response->error_message);
91
+        }
84 92
 
85 93
         // return the content
86 94
         return $response->results;
@@ -164,19 +172,29 @@  discard block
 block discarded – undo
164 172
         $item = array();
165 173
 
166 174
         // add street
167
-        if (!empty($street)) $item[] = $street;
175
+        if (!empty($street)) {
176
+            $item[] = $street;
177
+        }
168 178
 
169 179
         // add street number
170
-        if (!empty($streetNumber)) $item[] = $streetNumber;
180
+        if (!empty($streetNumber)) {
181
+            $item[] = $streetNumber;
182
+        }
171 183
 
172 184
         // add city
173
-        if (!empty($city)) $item[] = $city;
185
+        if (!empty($city)) {
186
+            $item[] = $city;
187
+        }
174 188
 
175 189
         // add zip
176
-        if (!empty($zip)) $item[] = $zip;
190
+        if (!empty($zip)) {
191
+            $item[] = $zip;
192
+        }
177 193
 
178 194
         // add country
179
-        if (!empty($country)) $item[] = $country;
195
+        if (!empty($country)) {
196
+            $item[] = $country;
197
+        }
180 198
 
181 199
         // define value
182 200
         $address = implode(' ', $item);
Please login to merge, or discard this patch.
examples/example.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
  * @author Jeroen Desloovere <[email protected]>
9 9
  */
10 10
 
11
-require_once __DIR__ . '/../src/Geolocation.php';
11
+require_once __DIR__.'/../src/Geolocation.php';
12 12
 
13 13
 use JeroenDesloovere\Geolocation\Geolocation;
14 14
 
@@ -16,10 +16,10 @@  discard block
 block discarded – undo
16 16
 $result = Geolocation::getCoordinates('Koningin Maria Hendrikaplein', '1', 'Gent', '9000', 'belgië');
17 17
 
18 18
 // dump result
19
-echo 'Coordinates = ' . $result['latitude'] . ', ' . $result['longitude'] . '<br/>';
19
+echo 'Coordinates = '.$result['latitude'].', '.$result['longitude'].'<br/>';
20 20
 
21 21
 // define result: @return array(label, street, streetNumber, city, cityLocal, zip, country, countryLabel)
22 22
 $result = Geolocation::getAddress(51.0363935, 3.7121008);
23 23
 
24 24
 // define result
25
-echo 'Address = ' . $result['label'] . '<br/>';
25
+echo 'Address = '.$result['label'].'<br/>';
Please login to merge, or discard this patch.
tests/GeolocationTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 namespace JeroenDesloovere\Geolocation\tests;
4 4
 
5 5
 // required to load
6
-require_once __DIR__ . '/../vendor/autoload.php';
6
+require_once __DIR__.'/../vendor/autoload.php';
7 7
 
8 8
 /*
9 9
  * This file is part of the Geolocation PHP Class from Jeroen Desloovere.
Please login to merge, or discard this patch.