View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( ca548b...de1208 )
by Yannick
176:21 queued 148:19
created
Status
Category
Toggle Patches
require/libs/geoPHP/tests/tests/methodsTest.php 1 patch
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch 
@@ -10,7 +10,7 @@  discard block
 
 block discarded – undo
10 10
11 11 
   function testMethods() {
12 12 
     foreach (scandir('./input') as $file) {
13 
-      $parts = explode('.',$file);
13 
+      $parts = explode('.', $file);
14 14 
       if ($parts[0]) {
15 15 
         $format = $parts[1];
16 16 
         $value = file_get_contents('./input/'.$file);
 
@@ -43,7 +43,7 @@  discard block
 
 block discarded – undo
43 43 
           array('name' => 'setSRID', 'argument' => '4326'),
44 44 
         );
45 45
46 
-        foreach($methods as $method) {
46 
+        foreach ($methods as $method) {
47 47 
           $argument = NULL;
48 48 
           $method_name = $method['name'];
49 49 
           if (isset($method['argument'])) {
 
@@ -69,32 +69,32 @@  discard block
 
 block discarded – undo
69 69 
       case 'y':
70 70 
       case 'x':
71 71 
         if ($geometry->geometryType() == 'Point') {
72 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
72 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
73 73 
         }
74 74 
         if ($geometry->geometryType() == 'LineString') {
75 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
75 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
76 76 
         }
77 77 
         if ($geometry->geometryType() == 'MultiLineString') {
78 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
78 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
79 79 
         }
80 80 
         break;
81 81 
       case 'geometryN':
82 82 
         if ($geometry->geometryType() == 'Point') {
83 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
83 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
84 84 
         }
85 85 
         if ($geometry->geometryType() == 'LineString') {
86 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
86 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
87 87 
         }
88 88 
         if ($geometry->geometryType() == 'MultiLineString') {
89 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
89 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
90 90 
         }
91 91 
         break;
92 92 
       case 'startPoint':
93 93 
         if ($geometry->geometryType() == 'Point') {
94 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
94 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
95 95 
         }
96 96 
         if ($geometry->geometryType() == 'LineString') {
97 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
97 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
98 98 
         }
99 99 
         if ($geometry->geometryType() == 'MultiLineString') {
100 100 
           //TODO: Add a method startPoint() to MultiLineString.
 
@@ -103,10 +103,10 @@  discard block
 
 block discarded – undo
103 103 
         break;
104 104 
       case 'endPoint':
105 105 
         if ($geometry->geometryType() == 'Point') {
106 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
106 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
107 107 
         }
108 108 
         if ($geometry->geometryType() == 'LineString') {
109 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
109 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
110 110 
         }
111 111 
         if ($geometry->geometryType() == 'MultiLineString') {
112 112 
           //TODO: Add a method endPoint() to MultiLineString.
 
@@ -115,32 +115,32 @@  discard block
 
 block discarded – undo
115 115 
         break;
116 116 
       case 'isRing':
117 117 
         if ($geometry->geometryType() == 'Point') {
118 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
118 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
119 119 
         }
120 120 
         if ($geometry->geometryType() == 'LineString') {
121 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
121 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
122 122 
         }
123 123 
         if ($geometry->geometryType() == 'MultiLineString') {
124 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
124 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
125 125 
         }
126 126 
         break;
127 127 
       case 'isClosed':
128 128 
         if ($geometry->geometryType() == 'Point') {
129 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
129 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
130 130 
         }
131 131 
         if ($geometry->geometryType() == 'LineString') {
132 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
132 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
133 133 
         }
134 134 
         if ($geometry->geometryType() == 'MultiLineString') {
135 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
135 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
136 136 
         }
137 137 
         break;
138 138 
       case 'pointN':
139 139 
         if ($geometry->geometryType() == 'Point') {
140 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
140 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
141 141 
         }
142 142 
         if ($geometry->geometryType() == 'LineString') {
143 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
143 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
144 144 
         }
145 145 
         if ($geometry->geometryType() == 'MultiLineString') {
146 146 
           //TODO: Add a method pointN() to MultiLineString.
 
@@ -149,123 +149,123 @@  discard block
 
 block discarded – undo
149 149 
         break;
150 150 
       case 'exteriorRing':
151 151 
         if ($geometry->geometryType() == 'Point') {
152 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
152 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
153 153 
         }
154 154 
         if ($geometry->geometryType() == 'LineString') {
155 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
155 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
156 156 
         }
157 157 
         if ($geometry->geometryType() == 'MultiLineString') {
158 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
158 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
159 159 
         }
160 160 
         break;
161 161 
       case 'numInteriorRings':
162 162 
         if ($geometry->geometryType() == 'Point') {
163 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
163 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
164 164 
         }
165 165 
         if ($geometry->geometryType() == 'LineString') {
166 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
166 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
167 167 
         }
168 168 
         if ($geometry->geometryType() == 'MultiLineString') {
169 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
169 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
170 170 
         }
171 171 
         break;
172 172 
       case 'interiorRingN':
173 173 
         if ($geometry->geometryType() == 'Point') {
174 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
174 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
175 175 
         }
176 176 
         if ($geometry->geometryType() == 'LineString') {
177 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
177 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
178 178 
         }
179 179 
         if ($geometry->geometryType() == 'MultiLineString') {
180 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
180 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
181 181 
         }
182 182 
         break;
183 183 
       case 'SRID':
184 184 
         if ($geometry->geometryType() == 'Point') {
185 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
185 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
186 186 
         }
187 187 
         if ($geometry->geometryType() == 'LineString') {
188 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
188 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
189 189 
         }
190 190 
         if ($geometry->geometryType() == 'MultiLineString') {
191 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
191 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
192 192 
         }
193 193 
         break;
194 194 
       case 'getBBox':
195 195 
         if ($geometry->geometryType() == 'Point') {
196 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
196 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
197 197 
         }
198 198 
         if ($geometry->geometryType() == 'LineString') {
199 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
199 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
200 200 
         }
201 201 
         if ($geometry->geometryType() == 'MultiLineString') {
202 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
202 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
203 203 
         }
204 204 
         break;
205 205 
       case 'centroid':
206 206 
         if ($geometry->geometryType() == 'Point') {
207 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
207 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
208 208 
         }
209 209 
         if ($geometry->geometryType() == 'LineString') {
210 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
210 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
211 211 
         }
212 212 
         if ($geometry->geometryType() == 'MultiLineString') {
213 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
213 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
214 214 
         }
215 215 
         break;
216 216 
       case 'length':
217 217 
         if ($geometry->geometryType() == 'Point') {
218 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
218 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
219 219 
         }
220 220 
         if ($geometry->geometryType() == 'LineString') {
221 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
221 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
222 222 
         }
223 223 
         if ($geometry->geometryType() == 'MultiLineString') {
224 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
224 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
225 225 
         }
226 226 
         break;
227 227 
       case 'numGeometries':
228 228 
         if ($geometry->geometryType() == 'Point') {
229 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
229 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
230 230 
         }
231 231 
         if ($geometry->geometryType() == 'LineString') {
232 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
232 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
233 233 
         }
234 234 
         if ($geometry->geometryType() == 'MultiLineString') {
235 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
235 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
236 236 
         }
237 237 
         break;
238 238 
       case 'numPoints':
239 239 
         if ($geometry->geometryType() == 'Point') {
240 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
240 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
241 241 
         }
242 242 
         if ($geometry->geometryType() == 'LineString') {
243 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
243 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
244 244 
         }
245 245 
         if ($geometry->geometryType() == 'MultiLineString') {
246 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
246 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
247 247 
         }
248 248 
         break;
249 249 
       case 'dimension':
250 250 
         if ($geometry->geometryType() == 'Point') {
251 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
251 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
252 252 
         }
253 253 
         if ($geometry->geometryType() == 'LineString') {
254 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
254 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
255 255 
         }
256 256 
         if ($geometry->geometryType() == 'MultiLineString') {
257 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
257 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
258 258 
         }
259 259 
         break;
260 260 
       case 'boundary':
261 261 
         if ($geometry->geometryType() == 'Point') {
262 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
262 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
263 263 
         }
264 264 
         if ($geometry->geometryType() == 'LineString') {
265 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
265 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
266 266 
         }
267 267 
         if ($geometry->geometryType() == 'MultiLineString') {
268 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
268 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
269 269 
         }
270 270 
         break;
271 271 
       case 'haversineLength':
 
@@ -274,16 +274,16 @@  discard block
 
 block discarded – undo
274 274 
         break;
275 275 
       case 'greatCircleLength':
276 276 
       case 'area':
277 
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
277 
+        $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
278 278 
         break;
279 279 
       case 'geometryType':
280 
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
280 
+        $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
281 281 
         break;
282 282 
       case 'setSRID':
283 283 
         //TODO: The method setSRID() should return TRUE.
284 284 
         break;
285 285 
       default:
286 
-        $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
286 
+        $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name);
287 287 
     }
288 288
289 289 
   }
 
@@ -294,7 +294,7 @@  discard block
 
 block discarded – undo
294 294
295 295 
     $methods = array(
296 296 
       //'boundary', //@@TODO: Uncomment this and fix errors
297 
-      'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
297 
+      'envelope', //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
298 298 
       'getBBox',
299 299 
       'x',
300 300 
       'y',
 
@@ -329,7 +329,7 @@  discard block
 
 block discarded – undo
329 329
330 330 
       // Now check base on type
331 331 
       if ($geos_type == 'object') {
332 
-        $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
332 
+        $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'), 'wkt'));
333 333
334 334 
         // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
335 335 
         // Using Pythagorean theorem
 
@@ -337,7 +337,7 @@  discard block
 
 block discarded – undo
337 337 
         $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
338 338
339 339 
         // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
340 
-        if ($haus_dist / $scale > 0.5) {
340 
+        if ($haus_dist/$scale > 0.5) {
341 341 
           $this->fail('Output mismatch on '.$method);
342 342 
           $this->dump('GEOS : ');
343 343 
           $this->dump($geos_result->out('wkt'));
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/tests/20120702Test.php 1 patch
Spacing   +58 added lines, -58 removed lines patch added patch discarded remove patch 
@@ -40,7 +40,7 @@  discard block
 
 block discarded – undo
40 40 
       array('name' => 'setSRID', 'argument' => '4326'),
41 41 
     );
42 42
43 
-    foreach($methods as $method) {
43 
+    foreach ($methods as $method) {
44 44 
       $argument = NULL;
45 45 
       $method_name = $method['name'];
46 46 
       if (isset($method['argument'])) {
 
@@ -61,32 +61,32 @@  discard block
 
 block discarded – undo
61 61 
       case 'y':
62 62 
       case 'x':
63 63 
         if ($geometry->geometryType() == 'Point') {
64 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
64 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
65 65 
         }
66 66 
         if ($geometry->geometryType() == 'LineString') {
67 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
67 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
68 68 
         }
69 69 
         if ($geometry->geometryType() == 'MultiLineString') {
70 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
70 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
71 71 
         }
72 72 
         break;
73 73 
       case 'geometryN':
74 74 
         if ($geometry->geometryType() == 'Point') {
75 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
75 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
76 76 
         }
77 77 
         if ($geometry->geometryType() == 'LineString') {
78 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
78 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
79 79 
         }
80 80 
         if ($geometry->geometryType() == 'MultiLineString') {
81 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
81 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
82 82 
         }
83 83 
         break;
84 84 
       case 'startPoint':
85 85 
         if ($geometry->geometryType() == 'Point') {
86 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
86 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
87 87 
         }
88 88 
         if ($geometry->geometryType() == 'LineString') {
89 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
89 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
90 90 
         }
91 91 
         if ($geometry->geometryType() == 'MultiLineString') {
92 92 
           //TODO: Add a method startPoint() to MultiLineString.
 
@@ -95,10 +95,10 @@  discard block
 
 block discarded – undo
95 95 
         break;
96 96 
       case 'endPoint':
97 97 
         if ($geometry->geometryType() == 'Point') {
98 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
98 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
99 99 
         }
100 100 
         if ($geometry->geometryType() == 'LineString') {
101 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
101 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
102 102 
         }
103 103 
         if ($geometry->geometryType() == 'MultiLineString') {
104 104 
           //TODO: Add a method endPoint() to MultiLineString.
 
@@ -107,32 +107,32 @@  discard block
 
 block discarded – undo
107 107 
         break;
108 108 
       case 'isRing':
109 109 
         if ($geometry->geometryType() == 'Point') {
110 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
110 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
111 111 
         }
112 112 
         if ($geometry->geometryType() == 'LineString') {
113 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
113 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
114 114 
         }
115 115 
         if ($geometry->geometryType() == 'MultiLineString') {
116 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
116 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
117 117 
         }
118 118 
         break;
119 119 
       case 'isClosed':
120 120 
         if ($geometry->geometryType() == 'Point') {
121 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
121 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
122 122 
         }
123 123 
         if ($geometry->geometryType() == 'LineString') {
124 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
124 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
125 125 
         }
126 126 
         if ($geometry->geometryType() == 'MultiLineString') {
127 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
127 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
128 128 
         }
129 129 
         break;
130 130 
       case 'pointN':
131 131 
         if ($geometry->geometryType() == 'Point') {
132 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
132 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
133 133 
         }
134 134 
         if ($geometry->geometryType() == 'LineString') {
135 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
135 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
136 136 
         }
137 137 
         if ($geometry->geometryType() == 'MultiLineString') {
138 138 
           //TODO: Add a method pointN() to MultiLineString.
 
@@ -141,35 +141,35 @@  discard block
 
 block discarded – undo
141 141 
         break;
142 142 
       case 'exteriorRing':
143 143 
         if ($geometry->geometryType() == 'Point') {
144 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
144 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
145 145 
         }
146 146 
         if ($geometry->geometryType() == 'LineString') {
147 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
147 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
148 148 
         }
149 149 
         if ($geometry->geometryType() == 'MultiLineString') {
150 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
150 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
151 151 
         }
152 152 
         break;
153 153 
       case 'numInteriorRings':
154 154 
         if ($geometry->geometryType() == 'Point') {
155 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
155 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
156 156 
         }
157 157 
         if ($geometry->geometryType() == 'LineString') {
158 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
158 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
159 159 
         }
160 160 
         if ($geometry->geometryType() == 'MultiLineString') {
161 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
161 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
162 162 
         }
163 163 
         break;
164 164 
       case 'interiorRingN':
165 165 
         if ($geometry->geometryType() == 'Point') {
166 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
166 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
167 167 
         }
168 168 
         if ($geometry->geometryType() == 'LineString') {
169 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
169 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
170 170 
         }
171 171 
         if ($geometry->geometryType() == 'MultiLineString') {
172 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
172 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
173 173 
         }
174 174 
         break;
175 175 
       case 'setSRID':
 
@@ -177,112 +177,112 @@  discard block
 
 block discarded – undo
177 177 
         break;
178 178 
       case 'SRID':
179 179 
         if ($geometry->geometryType() == 'Point') {
180 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
180 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
181 181 
         }
182 182 
         if ($geometry->geometryType() == 'LineString') {
183 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
183 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
184 184 
         }
185 185 
         if ($geometry->geometryType() == 'MultiLineString') {
186 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
186 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
187 187 
         }
188 188 
         break;
189 189 
       case 'getBBox':
190 190 
         if ($geometry->geometryType() == 'Point') {
191 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
191 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
192 192 
         }
193 193 
         if ($geometry->geometryType() == 'LineString') {
194 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
194 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
195 195 
         }
196 196 
         if ($geometry->geometryType() == 'MultiLineString') {
197 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
197 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
198 198 
         }
199 199 
         break;
200 200 
       case 'centroid':
201 201 
         if ($geometry->geometryType() == 'Point') {
202 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
202 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
203 203 
         }
204 204 
         if ($geometry->geometryType() == 'LineString') {
205 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
205 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
206 206 
         }
207 207 
         if ($geometry->geometryType() == 'MultiLineString') {
208 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
208 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
209 209 
         }
210 210 
         break;
211 211 
       case 'length':
212 212 
         if ($geometry->geometryType() == 'Point') {
213 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
213 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
214 214 
         }
215 215 
         if ($geometry->geometryType() == 'LineString') {
216 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
216 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
217 217 
         }
218 218 
         if ($geometry->geometryType() == 'MultiLineString') {
219 
-          $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on ' . $method_name);
219 
+          $this->assertEquals($geometry->$method_name($argument), (float) '0.11624637315233', 'Failed on '.$method_name);
220 220 
         }
221 221 
         break;
222 222 
       case 'numGeometries':
223 223 
         if ($geometry->geometryType() == 'Point') {
224 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
224 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
225 225 
         }
226 226 
         if ($geometry->geometryType() == 'LineString') {
227 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
227 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
228 228 
         }
229 229 
         if ($geometry->geometryType() == 'MultiLineString') {
230 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
230 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
231 231 
         }
232 232 
         break;
233 233 
       case 'numPoints':
234 234 
         if ($geometry->geometryType() == 'Point') {
235 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
235 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
236 236 
         }
237 237 
         if ($geometry->geometryType() == 'LineString') {
238 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
238 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
239 239 
         }
240 240 
         if ($geometry->geometryType() == 'MultiLineString') {
241 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
241 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
242 242 
         }
243 243 
         break;
244 244 
       case 'dimension':
245 245 
         if ($geometry->geometryType() == 'Point') {
246 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
246 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
247 247 
         }
248 248 
         if ($geometry->geometryType() == 'LineString') {
249 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
249 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
250 250 
         }
251 251 
         if ($geometry->geometryType() == 'MultiLineString') {
252 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
252 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
253 253 
         }
254 254 
         break;
255 255 
       case 'boundary':
256 256 
         if ($geometry->geometryType() == 'Point') {
257 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
257 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
258 258 
         }
259 259 
         if ($geometry->geometryType() == 'LineString') {
260 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
260 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
261 261 
         }
262 262 
         if ($geometry->geometryType() == 'MultiLineString') {
263 
-          $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
263 
+          $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
264 264 
         }
265 265 
         break;
266 266 
       case 'greatCircleLength':
267 267 
         if ($geometry->geometryType() == 'Point') {
268 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
268 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
269 269 
         }
270 270 
         if ($geometry->geometryType() == 'LineString') {
271 
-          $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
271 
+          $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
272 272 
         }
273 273 
         if ($geometry->geometryType() == 'MultiLineString') {
274 
-          $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on ' . $method_name);
274 
+          $this->assertNotEquals($geometry->$method_name($argument), '9500.9359867418', 'Failed on '.$method_name);
275 275 
         }
276 276 
         break;
277 277 
       case 'haversineLength':
278 278 
       case 'area':
279 
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
279 
+        $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
280 280 
         break;
281 281 
       case 'geometryType':
282 
-        $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
282 
+        $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
283 283 
         break;
284 284 
       default:
285 
-        $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
285 
+        $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name);
286 286 
     }
287 287 
   }
288 288 
 }
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/tests/geosTest.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch 
@@ -10,7 +10,7 @@  discard block
 
 block discarded – undo
10 10
11 11 
   function testGeos() {
12 12 
     foreach (scandir('./input') as $file) {
13 
-      $parts = explode('.',$file);
13 
+      $parts = explode('.', $file);
14 14 
       if ($parts[0]) {
15 15 
         $format = $parts[1];
16 16 
         $value = file_get_contents('./input/'.$file);
 
@@ -45,7 +45,7 @@  discard block
 
 block discarded – undo
45 45 
           array('name' => 'hausdorffDistance', 'argument' => $geometry),
46 46 
         );
47 47
48 
-        foreach($geosMethods as $method) {
48 
+        foreach ($geosMethods as $method) {
49 49 
           $argument = NULL;
50 50 
           $method_name = $method['name'];
51 51 
           if (isset($method['argument'])) {
 
@@ -57,24 +57,24 @@  discard block
 
 block discarded – undo
57 57 
             case 'equals':
58 58 
             case 'geos':
59 59 
               if ($geometry->geometryType() == 'Point') {
60 
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
60 
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
61 61 
               }
62 62 
               if ($geometry->geometryType() == 'LineString') {
63 
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
63 
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
64 64 
               }
65 65 
               if ($geometry->geometryType() == 'MultiLineString') {
66 
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
66 
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
67 67 
               }
68 68 
               break;
69 69 
             default:
70 70 
               if ($geometry->geometryType() == 'Point') {
71 
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
71 
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
72 72 
               }
73 73 
               if ($geometry->geometryType() == 'LineString') {
74 
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
74 
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
75 75 
               }
76 76 
               if ($geometry->geometryType() == 'MultiLineString') {
77 
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
77 
+                $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
78 78 
               }
79 79 
           }
80 80 
         }
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/tests/aliasesTest.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch 
@@ -10,7 +10,7 @@  discard block
 
 block discarded – undo
10 10
11 11 
   function testAliases() {
12 12 
     foreach (scandir('./input') as $file) {
13 
-      $parts = explode('.',$file);
13 
+      $parts = explode('.', $file);
14 14 
       if ($parts[0]) {
15 15 
         $format = $parts[1];
16 16 
         $value = file_get_contents('./input/'.$file);
 
@@ -28,7 +28,7 @@  discard block
 
 block discarded – undo
28 28 
           array('name' => 'asBinary'),
29 29 
         );
30 30
31 
-        foreach($aliases as $alias) {
31 
+        foreach ($aliases as $alias) {
32 32 
           $argument = NULL;
33 33 
           $alias_name = $alias['name'];
34 34 
           if (isset($alias['argument'])) {
 
@@ -38,67 +38,67 @@  discard block
 
 block discarded – undo
38 38 
           switch ($alias_name) {
39 39 
             case 'getSRID':
40 40 
               if ($geometry->geometryType() == 'Point') {
41 
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
41 
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
42 42 
               }
43 43 
               if ($geometry->geometryType() == 'LineString') {
44 
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
44 
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
45 45 
               }
46 46 
               if ($geometry->geometryType() == 'MultiLineString') {
47 
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
47 
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
48 48 
               }
49 49 
               break;
50 50 
             case 'getGeos':
51 51 
               if ($geometry->geometryType() == 'Point') {
52 
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
52 
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
53 53 
               }
54 54 
               if ($geometry->geometryType() == 'LineString') {
55 
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
55 
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
56 56 
               }
57 57 
               if ($geometry->geometryType() == 'MultiLineString') {
58 
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
58 
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
59 59 
               }
60 60 
               break;
61 61 
             case 'getX':
62 62 
             case 'getY':
63 63 
               if ($geometry->geometryType() == 'Point') {
64 
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
64 
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
65 65 
               }
66 66 
               if ($geometry->geometryType() == 'LineString') {
67 
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
67 
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
68 68 
               }
69 69 
               if ($geometry->geometryType() == 'MultiLineString') {
70 
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
70 
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
71 71 
               }
72 72 
               break;
73 73 
             case 'getArea':
74 74 
               if ($geometry->geometryType() == 'Point') {
75 
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
75 
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
76 76 
               }
77 77 
               if ($geometry->geometryType() == 'LineString') {
78 
-                $this->assertNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
78 
+                $this->assertNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
79 79 
               }
80 80 
               if ($geometry->geometryType() == 'MultiLineString') {
81 
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
81 
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
82 82 
               }
83 83 
               break;
84 84 
             case 'getCentroid':
85 85 
               if ($geometry->geometryType() == 'Point') {
86 
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
86 
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
87 87 
               }
88 88 
               if ($geometry->geometryType() == 'LineString') {
89 
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
89 
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
90 90 
               }
91 91 
               if ($geometry->geometryType() == 'MultiLineString') {
92 
-                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
92 
+                $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
93 93 
               }
94 94 
               break;
95 95 
             case 'asText':
96 96 
             case 'asBinary':
97 97 
             case 'getGeomType':
98 
-              $this->assertNotNull($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
98 
+              $this->assertNotNull($geometry->$alias_name($argument), 'Failed on '.$alias_name);
99 99 
               break;
100 100 
             default:
101 
-              $this->assertTrue($geometry->$alias_name($argument), 'Failed on ' . $alias_name);
101 
+              $this->assertTrue($geometry->$alias_name($argument), 'Failed on '.$alias_name);
102 102 
           }
103 103 
         }
104 104
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/tests/adaptersTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -10,7 +10,7 @@  discard block
 
 block discarded – undo
10 10
11 11 
   function testAdapters() {
12 12 
     foreach (scandir('./input') as $file) {
13 
-      $parts = explode('.',$file);
13 
+      $parts = explode('.', $file);
14 14 
       if ($parts[0]) {
15 15 
         $format = $parts[1];
16 16 
         $input = file_get_contents('./input/'.$file);
 
@@ -20,7 +20,7 @@  discard block
 
 block discarded – undo
20 20 
         foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
21 21 
           if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
22 22 
             $output = $geometry->out($adapter_key);
23 
-            $this->assertNotNull($output, "Empty output on "  . $adapter_key);
23 
+            $this->assertNotNull($output, "Empty output on ".$adapter_key);
24 24 
             if ($output) {
25 25 
               $adapter_loader = new $adapter_class();
26 26 
               $test_geom_1 = $adapter_loader->read($output);
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/tests/placeholdersTest.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -10,7 +10,7 @@  discard block
 
 block discarded – undo
10 10
11 11 
   function testPlaceholders() {
12 12 
     foreach (scandir('./input') as $file) {
13 
-      $parts = explode('.',$file);
13 
+      $parts = explode('.', $file);
14 14 
       if ($parts[0]) {
15 15 
         $format = $parts[1];
16 16 
         $value = file_get_contents('./input/'.$file);
 
@@ -26,7 +26,7 @@  discard block
 
 block discarded – undo
26 26 
           array('name' => 'm'),
27 27 
         );
28 28
29 
-        foreach($placeholders as $method) {
29 
+        foreach ($placeholders as $method) {
30 30 
           $argument = NULL;
31 31 
           $method_name = $method['name'];
32 32 
           if (isset($method['argument'])) {
 
@@ -37,13 +37,13 @@  discard block
 
 block discarded – undo
37 37 
             case 'm':
38 38 
             case 'z':
39 39 
               if ($geometry->geometryType() == 'Point') {
40 
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
40 
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
41 41 
               }
42 42 
               if ($geometry->geometryType() == 'LineString') {
43 
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
43 
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
44 44 
               }
45 45 
               if ($geometry->geometryType() == 'MultiLineString') {
46 
-                $this->assertNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
46 
+                $this->assertNull($geometry->$method_name($argument), 'Failed on '.$method_name);
47 47 
               }
48 48 
               break;
49 49 
             case 'coordinateDimension':
 
@@ -52,17 +52,17 @@  discard block
 
 block discarded – undo
52 52 
             case 'is3D':
53 53 
             case 'hasZ':
54 54 
               if ($geometry->geometryType() == 'Point') {
55 
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
55 
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
56 56 
               }
57 57 
               if ($geometry->geometryType() == 'LineString') {
58 
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
58 
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
59 59 
               }
60 60 
               if ($geometry->geometryType() == 'MultiLineString') {
61 
-                $this->assertNotNull($geometry->$method_name($argument), 'Failed on ' . $method_name);
61 
+                $this->assertNotNull($geometry->$method_name($argument), 'Failed on '.$method_name);
62 62 
               }
63 63 
               break;
64 64 
             default:
65 
-              $this->assertTrue($geometry->$method_name($argument), 'Failed on ' . $method_name);
65 
+              $this->assertTrue($geometry->$method_name($argument), 'Failed on '.$method_name);
66 66 
           }
67 67 
         }
68 68
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/test.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -18,7 +18,7 @@  discard block
 
 block discarded – undo
18 18 
   }
19 19
20 20 
   foreach (scandir('./input') as $file) {
21 
-    $parts = explode('.',$file);
21 
+    $parts = explode('.', $file);
22 22 
     if ($parts[0]) {
23 23 
       $format = $parts[1];
24 24 
       $value = file_get_contents('./input/'.$file);
 
@@ -88,7 +88,7 @@  discard block
 
 block discarded – undo
88 88 
   $geometry->difference($geometry);
89 89 
   $geometry->symDifference($geometry);
90 90 
   $geometry->union($geometry);
91 
-  $geometry->simplify(0);// @@TODO: Adjust this once we can deal with empty geometries
91 
+  $geometry->simplify(0); // @@TODO: Adjust this once we can deal with empty geometries
92 92 
   $geometry->disjoint($geometry);
93 93 
   $geometry->touches($geometry);
94 94 
   $geometry->intersects($geometry);
 
@@ -127,7 +127,7 @@  discard block
 
 block discarded – undo
127 127 
         }
128 128 
       }
129 129 
       else {
130 
-        print "Empty output on "  . $adapter_key . "\n";
130 
+        print "Empty output on ".$adapter_key."\n";
131 131 
       }
132 132 
     }
133 133 
   }
 
@@ -171,7 +171,7 @@  discard block
 
 block discarded – undo
171 171
172 172 
   $methods = array(
173 173 
     //'boundary', //@@TODO: Uncomment this and fix errors
174 
-    'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
174 
+    'envelope', //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
175 175 
     'getBBox',
176 176 
     'x',
177 177 
     'y',
 
@@ -204,7 +204,7 @@  discard block
 
 block discarded – undo
204 204
205 205 
     // Now check base on type
206 206 
     if ($geos_type == 'object') {
207 
-      $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
207 
+      $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'), 'wkt'));
208 208
209 209 
       // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
210 210 
       // Using Pythagorean theorem
 
@@ -212,7 +212,7 @@  discard block
 
 block discarded – undo
212 212 
       $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
213 213
214 214 
       // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
215 
-      if ($haus_dist / $scale > 0.5) {
215 
+      if ($haus_dist/$scale > 0.5) {
216 216 
         print 'Output mismatch on '.$method.":\n";
217 217 
         print 'GEOS : '.$geos_result->out('wkt')."\n";
218 218 
         print 'NORM : '.$norm_result->out('wkt')."\n";
 
@@ -237,7 +237,7 @@  discard block
 
 block discarded – undo
237 237 
 function test_detection($value, $format, $file) {
238 238 
   $detected = geoPHP::detectFormat($value);
239 239 
   if ($detected != $format) {
240 
-    if ($detected) print 'detected as ' . $detected . "\n";
240 
+    if ($detected) print 'detected as '.$detected."\n";
241 241 
     else print "not detected\n";
242 242 
   }
243 243 
   // Make sure it loads using auto-detect
Please login to merge, or discard this patch.
require/libs/geoPHP/tests/postgis.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -9,12 +9,12 @@  discard block
 
 block discarded – undo
9 9 
   include_once('../geoPHP.inc');
10 10
11 11 
   // Your database test table should contain 3 columns: name (text), type (text), geom (geometry)
12 
-  $host =     'localhost';
12 
+  $host = 'localhost';
13 13 
   $database = 'phayes';
14 
-  $table =    'test';
15 
-  $column =   'geom';
16 
-  $user =     'phayes';
17 
-  $pass =     'supersecret';
14 
+  $table = 'test';
15 
+  $column = 'geom';
16 
+  $user = 'phayes';
17 
+  $pass = 'supersecret';
18 18
19 19 
   $connection = pg_connect("host=$host dbname=$database user=$user password=$pass");
20 20 
   
@@ -25,7 +25,7 @@  discard block
 
 block discarded – undo
25 25 
   // ----------------------------
26 26
27 27 
   foreach (scandir('./input') as $file) {
28 
-    $parts = explode('.',$file);
28 
+    $parts = explode('.', $file);
29 29 
     if ($parts[0]) {
30 30 
       $name = $parts[0];
31 31 
       $format = $parts[1];
 
@@ -58,7 +58,7 @@  discard block
 
 block discarded – undo
58 58 
   // SELECT and INSERT directly, with no wrapping functions
59 59 
   $result = pg_fetch_all(pg_query($connection, "SELECT geom as geom FROM $table WHERE name='$name'"));
60 60 
   foreach ($result as $item) {
61 
-    $wkb = pack('H*',$item['geom']);   // Unpacking the hex blob
61 
+    $wkb = pack('H*', $item['geom']); // Unpacking the hex blob
62 62 
     $geom = geoPHP::load($wkb, $format); // We now have a geoPHP Geometry
63 63
64 64 
     // Let's re-insert directly into postGIS
Please login to merge, or discard this patch.
require/libs/geoPHP/lib/adapters/EWKT.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@
 
 block discarded – undo
16 16 
     $srid = $geometry->SRID();
17 17 
     $wkt = '';
18 18 
     if ($srid) {
19 
-      $wkt = 'SRID=' . $srid . ';';
19 
+      $wkt = 'SRID='.$srid.';';
20 20 
       $wkt .= $geometry->out('wkt');
21 21 
       return $wkt;
22 22 
     }
Please login to merge, or discard this patch.