Completed
Pull Request — development (#720)
by Thomas
06:42
created
htdocs/src/Oc/FieldNotes/Import/ImportService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -118,7 +118,7 @@
 block discarded – undo
118 118
          */
119 119
         $expressionAst = (new ExpressionLanguage())->parse($violation->getPropertyPath(), [])->getNodes();
120 120
 
121
-        $line = ((int) $expressionAst->nodes['node']->nodes[1]->attributes['value']) + 1;
121
+        $line = ((int)$expressionAst->nodes['node']->nodes[1]->attributes['value']) + 1;
122 122
 
123 123
         $linePrefix = $this->translator->trans('field_notes.error.line_prefix', [
124 124
             '%line%' => $line,
Please login to merge, or discard this patch.
htdocs/src/Oc/FieldNotes/Persistence/FieldNoteRepository.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
             $databaseArray
189 189
         );
190 190
 
191
-        $entity->id = (int) $this->connection->lastInsertId();
191
+        $entity->id = (int)$this->connection->lastInsertId();
192 192
 
193 193
         return $entity;
194 194
     }
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
             ['id' => $entity->id]
216 216
         );
217 217
 
218
-        $entity->id = (int) $this->connection->lastInsertId();
218
+        $entity->id = (int)$this->connection->lastInsertId();
219 219
 
220 220
         return $entity;
221 221
     }
Please login to merge, or discard this patch.
htdocs/src/Oc/Util/CBench.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
     {
29 29
         list($uSec, $sec) = explode(' ', microtime());
30 30
 
31
-        return ((float) $uSec + (float) $sec);
31
+        return ((float)$uSec + (float)$sec);
32 32
     }
33 33
 
34 34
     /**
Please login to merge, or discard this patch.
htdocs/src/Oc/GeoCache/Persistence/GeoCacheLog/GeoCacheLogRepository.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
             $databaseArray
181 181
         );
182 182
 
183
-        $entity->id = (int) $this->connection->lastInsertId();
183
+        $entity->id = (int)$this->connection->lastInsertId();
184 184
 
185 185
         return $entity;
186 186
     }
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
             ['id' => $entity->id]
208 208
         );
209 209
 
210
-        $entity->id = (int) $this->connection->lastInsertId();
210
+        $entity->id = (int)$this->connection->lastInsertId();
211 211
 
212 212
         return $entity;
213 213
     }
@@ -280,27 +280,27 @@  discard block
 block discarded – undo
280 280
     public function getEntityFromDatabaseArray(array $data)
281 281
     {
282 282
         $entity = new GeoCacheLogEntity();
283
-        $entity->id = (int) $data['id'];
283
+        $entity->id = (int)$data['id'];
284 284
         $entity->uuid = $data['uuid'];
285
-        $entity->node = (int) $data['node'];
285
+        $entity->node = (int)$data['node'];
286 286
         $entity->dateCreated = new DateTime($data['date_created']);
287 287
         $entity->entryLastModified = new DateTime($data['entry_last_modified']);
288 288
         $entity->lastModified = new DateTime($data['last_modified']);
289
-        $entity->okapiSyncbase = (int) $data['okapi_syncbase'];
289
+        $entity->okapiSyncbase = (int)$data['okapi_syncbase'];
290 290
         $entity->logLastModified = new DateTime($data['log_last_modified']);
291
-        $entity->cacheId = (int) $data['cache_id'];
292
-        $entity->userId = (int) $data['user_id'];
293
-        $entity->type = (int) $data['type'];
294
-        $entity->ocTeamComment = (bool) $data['oc_team_comment'];
291
+        $entity->cacheId = (int)$data['cache_id'];
292
+        $entity->userId = (int)$data['user_id'];
293
+        $entity->type = (int)$data['type'];
294
+        $entity->ocTeamComment = (bool)$data['oc_team_comment'];
295 295
         $entity->date = new DateTime($data['date']);
296 296
         $entity->orderDate = new DateTime($data['order_date']);
297
-        $entity->needsMaintenance = (bool) $data['needs_maintenance'];
298
-        $entity->listingOutdated = (bool) $data['listing_outdated'];
297
+        $entity->needsMaintenance = (bool)$data['needs_maintenance'];
298
+        $entity->listingOutdated = (bool)$data['listing_outdated'];
299 299
         $entity->text = $data['text'];
300
-        $entity->textHtml = (bool) $data['text_html'];
301
-        $entity->textHtmledit = (bool) $data['text_htmledit'];
302
-        $entity->ownerNotified = (bool) $data['owner_notified'];
303
-        $entity->picture = (int) $data['picture'];
300
+        $entity->textHtml = (bool)$data['text_html'];
301
+        $entity->textHtmledit = (bool)$data['text_htmledit'];
302
+        $entity->ownerNotified = (bool)$data['owner_notified'];
303
+        $entity->picture = (int)$data['picture'];
304 304
 
305 305
         return $entity;
306 306
     }
Please login to merge, or discard this patch.
htdocs/lib2/rowEditor.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
         }
385 385
 
386 386
         if ($type == RE_TYPE_INT) {
387
-            $value = (int) $value + 0;
387
+            $value = (int)$value + 0;
388 388
         } elseif ($type == RE_TYPE_FLOAT) {
389 389
             $value = $value + 0;
390 390
         } elseif ($type == RE_TYPE_DOUBLE) {
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
     public function pFormatValueSql($type, $value)
410 410
     {
411 411
         if ($type == RE_TYPE_INT) {
412
-            $value = (int) $value + 0;
412
+            $value = (int)$value + 0;
413 413
         } elseif ($type == RE_TYPE_FLOAT) {
414 414
             $value = $value + 0;
415 415
         } elseif ($type == RE_TYPE_DOUBLE) {
Please login to merge, or discard this patch.
htdocs/lib2/search/search.gpx.inc.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -140,19 +140,19 @@  discard block
 block discarded – undo
140 140
     $gpxTimeFormat = 'Y-m-d\TH:i:s\Z';
141 141
 
142 142
     $gpxStatus[0] = 'available="False" archived="False"'; // other (unavailable, not archived)
143
-    $gpxStatus[1] = 'available="True" archived="False"';  // available, not archived
143
+    $gpxStatus[1] = 'available="True" archived="False"'; // available, not archived
144 144
     $gpxStatus[2] = 'available="False" archived="False"'; // unavailable, not archived
145
-    $gpxStatus[3] = 'available="False" archived="True"';  // unavailable, archived
146
-    $gpxStatus[6] = 'available="False" archived="True"';  // locked, visible
145
+    $gpxStatus[3] = 'available="False" archived="True"'; // unavailable, archived
146
+    $gpxStatus[6] = 'available="False" archived="True"'; // locked, visible
147 147
 
148 148
     $gpxContainer[1] = 'Other';
149 149
     $gpxContainer[2] = 'Micro';
150 150
     $gpxContainer[3] = 'Small';
151 151
     $gpxContainer[4] = 'Regular';
152 152
     $gpxContainer[5] = 'Large';
153
-    $gpxContainer[6] = 'Large';     // very large
154
-    $gpxContainer[7] = 'Virtual';   // no container
155
-    $gpxContainer[8] = 'Micro';     // nano
153
+    $gpxContainer[6] = 'Large'; // very large
154
+    $gpxContainer[7] = 'Virtual'; // no container
155
+    $gpxContainer[8] = 'Micro'; // nano
156 156
 
157 157
     $gpxOcSize[1] = 'Other';
158 158
     $gpxOcSize[2] = 'Micro';
@@ -169,10 +169,10 @@  discard block
 block discarded – undo
169 169
     $gpxType[4] = 'Virtual Cache';
170 170
     $gpxType[5] = 'Webcam Cache';
171 171
     $gpxType[6] = 'Event Cache';
172
-    $gpxType[7] = 'Unknown Cache';        // quiz cache
173
-    $gpxType[8] = 'Unknown Cache';        // maths/physics cache
174
-    $gpxType[9] = 'Unknown Cache';        // moving cache
175
-    $gpxType[10] = 'Traditional Cache';   // drive-in cache
172
+    $gpxType[7] = 'Unknown Cache'; // quiz cache
173
+    $gpxType[8] = 'Unknown Cache'; // maths/physics cache
174
+    $gpxType[9] = 'Unknown Cache'; // moving cache
175
+    $gpxType[10] = 'Traditional Cache'; // drive-in cache
176 176
 
177 177
     $gpxOcType[1] = 'Other Cache';
178 178
     $gpxOcType[2] = 'Traditional Cache';
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
     $gpxOcType[5] = 'Webcam Cache';
182 182
     $gpxOcType[6] = 'Event Cache';
183 183
     $gpxOcType[7] = 'Quiz Cache';
184
-    $gpxOcType[8] = 'Quiz Cache';         // maths/physics cache
184
+    $gpxOcType[8] = 'Quiz Cache'; // maths/physics cache
185 185
     $gpxOcType[9] = 'Moving Cache';
186 186
     $gpxOcType[10] = 'Traditional Cache'; // drive-in cache
187 187
 
@@ -194,8 +194,8 @@  discard block
 block discarded – undo
194 194
     $gpxLogType[9] = 'Archive';
195 195
     $gpxLogType[10] = 'Owner Maintenance';
196 196
     $gpxLogType[11] = 'Temporarily Disable Listing';
197
-    $gpxLogType[13] = 'Archive';          // locked
198
-    $gpxLogType[14] = 'Archive';          // locked/invisible
197
+    $gpxLogType[13] = 'Archive'; // locked
198
+    $gpxLogType[14] = 'Archive'; // locked/invisible
199 199
 
200 200
     $gpxSymNormal = 'Geocache';
201 201
     $gpxSymFound = 'Geocache Found';
@@ -524,9 +524,9 @@  discard block
 block discarded – undo
524 524
         $thisline = mb_ereg_replace('{oc_logs}', $oc_logentries, $thisline);
525 525
 
526 526
         // attributes
527
-        $addAttributes = [-1];  // dummy
527
+        $addAttributes = [-1]; // dummy
528 528
         if ($r['type'] == 10) {   // Drive-in
529
-            $addAttributes[] = 24;  // near the car / park and grab
529
+            $addAttributes[] = 24; // near the car / park and grab
530 530
         }
531 531
         $rsAttributes = sql_slave(
532 532
             "
Please login to merge, or discard this patch.
htdocs/lib2/search/search.ov2.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@
 block discarded – undo
66 66
         $cacheid = convert_string($r['wp_oc']);
67 67
 
68 68
         $line = "$name by $username, $type, $size, $cacheid";
69
-        $record = pack('CLllA*x', 2, 1 + 4 + 4 + 4 + strlen($line) + 1, (int) $lon, (int) $lat, $line);
69
+        $record = pack('CLllA*x', 2, 1 + 4 + 4 + 4 + strlen($line) + 1, (int)$lon, (int)$lat, $line);
70 70
 
71 71
         append_output($record);
72 72
     }
Please login to merge, or discard this patch.
htdocs/lib2/util.inc.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
  */
10 10
 function is_valid_email_address($eMail)
11 11
 {
12
-    return (int) ($eMail === filter_var($eMail, FILTER_VALIDATE_EMAIL));
12
+    return (int)($eMail === filter_var($eMail, FILTER_VALIDATE_EMAIL));
13 13
 }
14 14
 
15 15
 /**
Please login to merge, or discard this patch.
htdocs/lib2/menu.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
                         'parent' => MNU_MAP,
79 79
                     ];
80 80
                     $menuitem[MNU_MAP]['subitems'][] = $menu_map;
81
-                    ++ $menu_map;
81
+                    ++$menu_map;
82 82
                 }
83 83
             }
84 84
         }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
         $rsSubmenu = sqlf('SELECT `id` FROM `sys_menu` WHERE `parent`=0 ORDER BY `parent` ASC, `position` ASC');
106 106
         while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
107 107
             $aMenu[MNU_ROOT]['subitems'][$nPos] = $rSubmenu['id'];
108
-            $nPos ++;
108
+            $nPos++;
109 109
         }
110 110
         sql_free_result($rsSubmenu);
111 111
         fwrite($f, "\n");
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
             );
143 143
             while ($rSubmenu = sql_fetch_assoc($rsSubmenu)) {
144 144
                 $aMenu[$r['id']]['subitems'][$nPos] = $rSubmenu['id'];
145
-                $nPos ++;
145
+                $nPos++;
146 146
             }
147 147
             sql_free_result($rsSubmenu);
148 148
         }
Please login to merge, or discard this patch.