Completed
Pull Request — development (#691)
by Nick
04:51 queued 45s
created
htdocs/adminhistory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -28,14 +28,14 @@
 block discarded – undo
28 28
         [':wp' => $_REQUEST['wp']]
29 29
     );
30 30
 } else {
31
-    $cacheId = isset($_REQUEST['cacheid']) ? (int) $_REQUEST['cacheid'] : -1;
31
+    $cacheId = isset($_REQUEST['cacheid']) ? (int)$_REQUEST['cacheid'] : -1;
32 32
 }
33 33
 
34 34
 $showHistory = false;
35 35
 $error = '';
36 36
 
37 37
 if ($cacheId >= 0 &&
38
-    $connection->fetchColumn('SELECT COUNT(*) FROM `caches` WHERE `cache_id`=:id',[':id' => $cacheId]) <> 1)
38
+    $connection->fetchColumn('SELECT COUNT(*) FROM `caches` WHERE `cache_id`=:id', [':id' => $cacheId]) <> 1)
39 39
 {
40 40
     $error = $translate->t('Cache not found', '', '', 0);
41 41
 } elseif ($cacheId > 0) {
Please login to merge, or discard this patch.
htdocs/index.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -66,16 +66,16 @@  discard block
 block discarded – undo
66 66
     // current cache and log-counters
67 67
     $tpl->assign(
68 68
         'count_hiddens',
69
-        number1000((int) $connection->fetchColumn('SELECT COUNT(*) AS `hiddens` FROM `caches` WHERE `status` = 1'))
69
+        number1000((int)$connection->fetchColumn('SELECT COUNT(*) AS `hiddens` FROM `caches` WHERE `status` = 1'))
70 70
     );
71 71
     $tpl->assign(
72 72
         'count_founds',
73
-        number1000((int) $connection->fetchColumn('SELECT COUNT(*) AS `founds` FROM `cache_logs` WHERE `type` = 1'))
73
+        number1000((int)$connection->fetchColumn('SELECT COUNT(*) AS `founds` FROM `cache_logs` WHERE `type` = 1'))
74 74
     );
75 75
     $tpl->assign(
76 76
         'count_users',
77 77
         number1000(
78
-            (int) $connection->fetchColumn(
78
+            (int)$connection->fetchColumn(
79 79
                 'SELECT COUNT(*) AS `users`
80 80
                  FROM (
81 81
                        SELECT DISTINCT `user_id`
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     // get total event count for all countries
94 94
     $tpl->assign(
95 95
         'total_events',
96
-        (int) $connection->fetchColumn(
96
+        (int)$connection->fetchColumn(
97 97
             'SELECT COUNT(*)
98 98
              FROM `caches`
99 99
              WHERE `type` = 6
Please login to merge, or discard this patch.
htdocs/src/Oc/GeoCache/Persistence/GeoCache/GeoCacheRepository.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 
82 82
         if (count($where) > 0) {
83 83
             foreach ($where as $column => $value) {
84
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
84
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
85 85
             }
86 86
         }
87 87
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 
114 114
         if (count($where) > 0) {
115 115
             foreach ($where as $column => $value) {
116
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
116
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
117 117
             }
118 118
         }
119 119
 
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
             $databaseArray
190 190
         );
191 191
 
192
-        $entity->cacheId = (int) $this->connection->lastInsertId();
192
+        $entity->cacheId = (int)$this->connection->lastInsertId();
193 193
 
194 194
         return $entity;
195 195
     }
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
             ['cache_id' => $entity->cacheId]
218 218
         );
219 219
 
220
-        $entity->cacheId = (int) $this->connection->lastInsertId();
220
+        $entity->cacheId = (int)$this->connection->lastInsertId();
221 221
 
222 222
         return $entity;
223 223
     }
@@ -307,38 +307,38 @@  discard block
 block discarded – undo
307 307
         $entity = new GeoCacheEntity();
308 308
         $entity->cacheId = $data['cache_id'];
309 309
         $entity->uuid = $data['uuid'];
310
-        $entity->node = (int) $data['node'];
310
+        $entity->node = (int)$data['node'];
311 311
         $entity->dateCreated = new DateTime($data['date_created']);
312
-        $entity->isPublishdate = (bool) $data['is_publishdate'];
312
+        $entity->isPublishdate = (bool)$data['is_publishdate'];
313 313
         $entity->lastModified = new DateTime($data['last_modified']);
314
-        $entity->okapiSyncbase = (int) $data['okapi_syncbase'];
314
+        $entity->okapiSyncbase = (int)$data['okapi_syncbase'];
315 315
         $entity->listingLastModified = new DateTime($data['listing_last_modified']);
316 316
         $entity->metaLastModified = new DateTime($data['meta_last_modified']);
317
-        $entity->userId = (int) $data['user_id'];
317
+        $entity->userId = (int)$data['user_id'];
318 318
         $entity->name = $data['name'];
319
-        $entity->longitude = (double) $data['longitude'];
320
-        $entity->latitude = (double) $data['latitude'];
321
-        $entity->type = (int) $data['type'];
322
-        $entity->status = (int) $data['status'];
319
+        $entity->longitude = (double)$data['longitude'];
320
+        $entity->latitude = (double)$data['latitude'];
321
+        $entity->type = (int)$data['type'];
322
+        $entity->status = (int)$data['status'];
323 323
         $entity->country = $data['country'];
324 324
         $entity->dateHidden = new DateTime($data['date_hidden']);
325
-        $entity->size = (int) $data['size'];
326
-        $entity->difficulty = (int) $data['difficulty'];
327
-        $entity->terrain = (int) $data['terrain'];
325
+        $entity->size = (int)$data['size'];
326
+        $entity->difficulty = (int)$data['difficulty'];
327
+        $entity->terrain = (int)$data['terrain'];
328 328
         $entity->logpw = $data['logpw'];
329
-        $entity->searchTime = (float) $data['search_time'];
330
-        $entity->wayLength = (float) $data['way_length'];
329
+        $entity->searchTime = (float)$data['search_time'];
330
+        $entity->wayLength = (float)$data['way_length'];
331 331
         $entity->wpGc = $data['wp_gc'];
332 332
         $entity->wpGcMaintained = $data['wp_gc_maintained'];
333 333
         $entity->wpOc = $data['wp_oc'];
334 334
         $entity->descLanguages = $data['desc_languages'];
335 335
         $entity->defaultDesclang = $data['default_desclang'];
336 336
         $entity->dateActivate = new DateTime($data['date_activate']);
337
-        $entity->needNpaRecalc = (bool) $data['need_npa_recalc'];
338
-        $entity->showCachelists = (bool) $data['show_cachelists'];
339
-        $entity->protectOldCoords = (bool) $data['protect_old_coords'];
340
-        $entity->needsMaintenance = (bool) $data['needs_maintenance'];
341
-        $entity->listingOutdated = (bool) $data['listing_outdated'];
337
+        $entity->needNpaRecalc = (bool)$data['need_npa_recalc'];
338
+        $entity->showCachelists = (bool)$data['show_cachelists'];
339
+        $entity->protectOldCoords = (bool)$data['protect_old_coords'];
340
+        $entity->needsMaintenance = (bool)$data['needs_maintenance'];
341
+        $entity->listingOutdated = (bool)$data['listing_outdated'];
342 342
         $entity->flagsLastModified = new DateTime($data['flags_last_modified']);
343 343
 
344 344
         return $entity;
Please login to merge, or discard this patch.
htdocs/src/Oc/FieldNotes/Persistence/FieldNoteRepository.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
             ->from(self::TABLE);
84 84
 
85 85
         foreach ($where as $column => $value) {
86
-            $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
86
+            $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
87 87
         }
88 88
 
89 89
         foreach ($order as $field => $direction) {
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 
126 126
         if (count($where) > 0) {
127 127
             foreach ($where as $column => $value) {
128
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
128
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
129 129
             }
130 130
         }
131 131
 
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
             $databaseArray
193 193
         );
194 194
 
195
-        $entity->id = (int) $this->connection->lastInsertId();
195
+        $entity->id = (int)$this->connection->lastInsertId();
196 196
 
197 197
         return $entity;
198 198
     }
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
             ['id' => $entity->id]
221 221
         );
222 222
 
223
-        $entity->id = (int) $this->connection->lastInsertId();
223
+        $entity->id = (int)$this->connection->lastInsertId();
224 224
 
225 225
         return $entity;
226 226
     }
Please login to merge, or discard this patch.
htdocs/src/Oc/GeoCache/Persistence/GeoCacheLog/GeoCacheLogRepository.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 
81 81
         if (count($where) > 0) {
82 82
             foreach ($where as $column => $value) {
83
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
83
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
84 84
             }
85 85
         }
86 86
 
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 
113 113
         if (count($where) > 0) {
114 114
             foreach ($where as $column => $value) {
115
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
115
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
116 116
             }
117 117
         }
118 118
 
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
             $databaseArray
186 186
         );
187 187
 
188
-        $entity->id = (int) $this->connection->lastInsertId();
188
+        $entity->id = (int)$this->connection->lastInsertId();
189 189
 
190 190
         return $entity;
191 191
     }
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
             ['id' => $entity->id]
214 214
         );
215 215
 
216
-        $entity->id = (int) $this->connection->lastInsertId();
216
+        $entity->id = (int)$this->connection->lastInsertId();
217 217
 
218 218
         return $entity;
219 219
     }
@@ -287,27 +287,27 @@  discard block
 block discarded – undo
287 287
     public function getEntityFromDatabaseArray(array $data)
288 288
     {
289 289
         $entity = new GeoCacheLogEntity();
290
-        $entity->id = (int) $data['id'];
290
+        $entity->id = (int)$data['id'];
291 291
         $entity->uuid = $data['uuid'];
292
-        $entity->node = (int) $data['node'];
292
+        $entity->node = (int)$data['node'];
293 293
         $entity->dateCreated = new DateTime($data['date_created']);
294 294
         $entity->entryLastModified = new DateTime($data['entry_last_modified']);
295 295
         $entity->lastModified = new DateTime($data['last_modified']);
296
-        $entity->okapiSyncbase = (int) $data['okapi_syncbase'];
296
+        $entity->okapiSyncbase = (int)$data['okapi_syncbase'];
297 297
         $entity->logLastModified = new DateTime($data['log_last_modified']);
298
-        $entity->cacheId = (int) $data['cache_id'];
299
-        $entity->userId = (int) $data['user_id'];
300
-        $entity->type = (int) $data['type'];
301
-        $entity->ocTeamComment = (bool) $data['oc_team_comment'];
298
+        $entity->cacheId = (int)$data['cache_id'];
299
+        $entity->userId = (int)$data['user_id'];
300
+        $entity->type = (int)$data['type'];
301
+        $entity->ocTeamComment = (bool)$data['oc_team_comment'];
302 302
         $entity->date = new DateTime($data['date']);
303 303
         $entity->orderDate = new DateTime($data['order_date']);
304
-        $entity->needsMaintenance = (bool) $data['needs_maintenance'];
305
-        $entity->listingOutdated = (bool) $data['listing_outdated'];
304
+        $entity->needsMaintenance = (bool)$data['needs_maintenance'];
305
+        $entity->listingOutdated = (bool)$data['listing_outdated'];
306 306
         $entity->text = $data['text'];
307
-        $entity->textHtml = (bool) $data['text_html'];
308
-        $entity->textHtmledit = (bool) $data['text_htmledit'];
309
-        $entity->ownerNotified = (bool) $data['owner_notified'];
310
-        $entity->picture = (int) $data['picture'];
307
+        $entity->textHtml = (bool)$data['text_html'];
308
+        $entity->textHtmledit = (bool)$data['text_htmledit'];
309
+        $entity->ownerNotified = (bool)$data['owner_notified'];
310
+        $entity->picture = (int)$data['picture'];
311 311
 
312 312
         return $entity;
313 313
     }
Please login to merge, or discard this patch.
htdocs/okapi/meta.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php return array (
1
+<?php return array(
2 2
   'version_number' => 1684,
3 3
   'git_revision' => '8b1f529bf3f46aaad59ca83f0f95b37c20e71fa0',
4 4
 );
5 5
\ No newline at end of file
Please login to merge, or discard this patch.
htdocs/src/Oc/Command/CreateWebCacheCommand.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
          */
102 102
         foreach ($rii as $file) {
103 103
 
104
-            if ($file->isDir() || $file->getExtension() !== 'js'){
104
+            if ($file->isDir() || $file->getExtension() !== 'js') {
105 105
                 continue;
106 106
             }
107 107
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
         $scss = new Compiler();
130 130
         $scss->setIgnoreErrors(true);
131 131
         $scss->addImportPath($applicationScssPath);
132
-        $scss->addImportPath(function ($path) use ($projectDir) {
132
+        $scss->addImportPath(function($path) use ($projectDir) {
133 133
             //Check for tilde as this refers to the node_modules dir
134 134
             if (strpos($path, '~') === 0) {
135 135
                 $path = str_replace(
Please login to merge, or discard this patch.