Completed
Pull Request — development (#736)
by Kai
04:35
created
htdocs/src/Oc/GeoCache/Persistence/GeoCache/GeoCacheRepository.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
     public function fetchOneBy(array $where = [])
80 80
     {
81 81
         $queryBuilder = $this->connection->createQueryBuilder()
82
-             ->select('*')
83
-             ->from(self::TABLE)
84
-             ->setMaxResults(1);
82
+                ->select('*')
83
+                ->from(self::TABLE)
84
+                ->setMaxResults(1);
85 85
 
86 86
         if (count($where) > 0) {
87 87
             foreach ($where as $column => $value) {
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
     public function fetchBy(array $where = [])
113 113
     {
114 114
         $queryBuilder = $this->connection->createQueryBuilder()
115
-             ->select('*')
116
-             ->from(self::TABLE);
115
+                ->select('*')
116
+                ->from(self::TABLE);
117 117
 
118 118
         if (count($where) > 0) {
119 119
             foreach ($where as $column => $value) {
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
             $databaseArray
185 185
         );
186 186
 
187
-        $entity->cacheId = (int) $this->connection->lastInsertId();
187
+        $entity->cacheId = (int)$this->connection->lastInsertId();
188 188
 
189 189
         return $entity;
190 190
     }
@@ -298,38 +298,38 @@  discard block
 block discarded – undo
298 298
         $entity = new GeoCacheEntity();
299 299
         $entity->cacheId = $data['cache_id'];
300 300
         $entity->uuid = $data['uuid'];
301
-        $entity->node = (int) $data['node'];
301
+        $entity->node = (int)$data['node'];
302 302
         $entity->dateCreated = new DateTime($data['date_created']);
303
-        $entity->isPublishdate = (bool) $data['is_publishdate'];
303
+        $entity->isPublishdate = (bool)$data['is_publishdate'];
304 304
         $entity->lastModified = new DateTime($data['last_modified']);
305
-        $entity->okapiSyncbase = (int) $data['okapi_syncbase'];
305
+        $entity->okapiSyncbase = (int)$data['okapi_syncbase'];
306 306
         $entity->listingLastModified = new DateTime($data['listing_last_modified']);
307 307
         $entity->metaLastModified = new DateTime($data['meta_last_modified']);
308
-        $entity->userId = (int) $data['user_id'];
308
+        $entity->userId = (int)$data['user_id'];
309 309
         $entity->name = $data['name'];
310
-        $entity->longitude = (double) $data['longitude'];
311
-        $entity->latitude = (double) $data['latitude'];
312
-        $entity->type = (int) $data['type'];
313
-        $entity->status = (int) $data['status'];
310
+        $entity->longitude = (double)$data['longitude'];
311
+        $entity->latitude = (double)$data['latitude'];
312
+        $entity->type = (int)$data['type'];
313
+        $entity->status = (int)$data['status'];
314 314
         $entity->country = $data['country'];
315 315
         $entity->dateHidden = new DateTime($data['date_hidden']);
316
-        $entity->size = (int) $data['size'];
317
-        $entity->difficulty = (int) $data['difficulty'];
318
-        $entity->terrain = (int) $data['terrain'];
316
+        $entity->size = (int)$data['size'];
317
+        $entity->difficulty = (int)$data['difficulty'];
318
+        $entity->terrain = (int)$data['terrain'];
319 319
         $entity->logpw = $data['logpw'];
320
-        $entity->searchTime = (float) $data['search_time'];
321
-        $entity->wayLength = (float) $data['way_length'];
320
+        $entity->searchTime = (float)$data['search_time'];
321
+        $entity->wayLength = (float)$data['way_length'];
322 322
         $entity->wpGc = $data['wp_gc'];
323 323
         $entity->wpGcMaintained = $data['wp_gc_maintained'];
324 324
         $entity->wpOc = $data['wp_oc'];
325 325
         $entity->descLanguages = $data['desc_languages'];
326 326
         $entity->defaultDesclang = $data['default_desclang'];
327 327
         $entity->dateActivate = new DateTime($data['date_activate']);
328
-        $entity->needNpaRecalc = (bool) $data['need_npa_recalc'];
329
-        $entity->showCachelists = (bool) $data['show_cachelists'];
330
-        $entity->protectOldCoords = (bool) $data['protect_old_coords'];
331
-        $entity->needsMaintenance = (bool) $data['needs_maintenance'];
332
-        $entity->listingOutdated = (bool) $data['listing_outdated'];
328
+        $entity->needNpaRecalc = (bool)$data['need_npa_recalc'];
329
+        $entity->showCachelists = (bool)$data['show_cachelists'];
330
+        $entity->protectOldCoords = (bool)$data['protect_old_coords'];
331
+        $entity->needsMaintenance = (bool)$data['needs_maintenance'];
332
+        $entity->listingOutdated = (bool)$data['listing_outdated'];
333 333
         $entity->flagsLastModified = new DateTime($data['flags_last_modified']);
334 334
 
335 335
         return $entity;
Please login to merge, or discard this patch.
htdocs/thumbs.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 );
38 38
 if ($r) {
39 39
     if ($r['object_type'] == 1) {
40
-        $check = (int) $connection
40
+        $check = (int)$connection
41 41
             ->fetchColumn(
42 42
                 'SELECT COUNT(*)
43 43
                  FROM `cache_logs`
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
         }
64 64
     } elseif ($r['object_type'] == 2) {
65
-        $check = (int) $connection
65
+        $check = (int)$connection
66 66
             ->fetchColumn(
67 67
                 'SELECT COUNT(*)
68 68
                            FROM `caches`
Please login to merge, or discard this patch.
htdocs/adminuser.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -142,22 +142,22 @@
 block discarded – undo
142 142
 
143 143
     $tpl->assign('showdetails', true);
144 144
 
145
-    $r['hidden'] = (int) $connection->fetchColumn(
145
+    $r['hidden'] = (int)$connection->fetchColumn(
146 146
         'SELECT COUNT(*) FROM `caches` WHERE `user_id`=:userId', [':userId' => $r['user_id']]
147 147
     );
148
-    $r['hidden_active'] = (int) $connection->fetchColumn(
148
+    $r['hidden_active'] = (int)$connection->fetchColumn(
149 149
         'SELECT COUNT(*) FROM `caches` WHERE `user_id`= :userId AND `status`=1',
150 150
         [':userId' => $r['user_id']]
151 151
     );
152
-    $r['logentries'] = (int) $connection->fetchColumn(
152
+    $r['logentries'] = (int)$connection->fetchColumn(
153 153
         'SELECT COUNT(*) FROM `cache_logs` WHERE `user_id`= :userId',
154 154
         [':userId' => $r['user_id']]
155 155
     );
156
-    $r['deleted_logentries'] = (int) $connection->fetchColumn(
156
+    $r['deleted_logentries'] = (int)$connection->fetchColumn(
157 157
         'SELECT COUNT(*) FROM `cache_logs_archived` WHERE `user_id`= :userId',
158 158
         [':userId' => $r['user_id']]
159 159
     );
160
-    $r['reports'] = (int) $connection->fetchColumn(
160
+    $r['reports'] = (int)$connection->fetchColumn(
161 161
         'SELECT COUNT(*) FROM `cache_reports` WHERE `userid`= :userId',
162 162
         [':userId' => $r['user_id']]
163 163
     );
Please login to merge, or discard this patch.
htdocs/src/Oc/Language/LanguageRepository.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -218,10 +218,10 @@
 block discarded – undo
218 218
         $entity->nativeName = $data['native_name'];
219 219
         $entity->de = $data['de'];
220 220
         $entity->en = $data['en'];
221
-        $entity->translationId = (int) $data['trans_id'];
222
-        $entity->listDefaultDe = (bool) $data['list_default_de'];
223
-        $entity->listDefaultEn = (bool) $data['list_default_en'];
224
-        $entity->isTranslated = (bool) $data['is_translated'];
221
+        $entity->translationId = (int)$data['trans_id'];
222
+        $entity->listDefaultDe = (bool)$data['list_default_de'];
223
+        $entity->listDefaultEn = (bool)$data['list_default_en'];
224
+        $entity->isTranslated = (bool)$data['is_translated'];
225 225
 
226 226
         return $entity;
227 227
     }
Please login to merge, or discard this patch.
htdocs/src/Oc/Country/CountryRepository.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -181,9 +181,9 @@
 block discarded – undo
181 181
         $entity->name = $data['name'];
182 182
         $entity->de = $data['de'];
183 183
         $entity->en = $data['en'];
184
-        $entity->translationId = (int) $data['trans_id'];
185
-        $entity->listDefaultDe = (bool) $data['list_default_de'];
186
-        $entity->listDefaultEn = (bool) $data['list_default_en'];
184
+        $entity->translationId = (int)$data['trans_id'];
185
+        $entity->listDefaultDe = (bool)$data['list_default_de'];
186
+        $entity->listDefaultEn = (bool)$data['list_default_en'];
187 187
         $entity->sortDe = $data['sort_de'];
188 188
         $entity->sortEn = $data['sort_en'];
189 189
 
Please login to merge, or discard this patch.
htdocs/src/Oc/User/UserRepository.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
             $databaseArray
113 113
         );
114 114
 
115
-        $entity->id = (int) $this->connection->lastInsertId();
115
+        $entity->id = (int)$this->connection->lastInsertId();
116 116
 
117 117
         return $entity;
118 118
     }
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
             ['id' => $entity->id]
141 141
         );
142 142
 
143
-        $entity->id = (int) $this->connection->lastInsertId();
143
+        $entity->id = (int)$this->connection->lastInsertId();
144 144
 
145 145
         return $entity;
146 146
     }
@@ -222,13 +222,13 @@  discard block
 block discarded – undo
222 222
     public function getEntityFromDatabaseArray(array $data)
223 223
     {
224 224
         $entity = new UserEntity();
225
-        $entity->id = (int) $data['user_id'];
225
+        $entity->id = (int)$data['user_id'];
226 226
         $entity->username = $data['username'];
227 227
         $entity->password = $data['password'];
228 228
         $entity->email = $data['email'];
229
-        $entity->latitude = (double) $data['latitude'];
230
-        $entity->longitude = (double) $data['longitude'];
231
-        $entity->isActive = (bool) $data['is_active_flag'];
229
+        $entity->latitude = (double)$data['latitude'];
230
+        $entity->longitude = (double)$data['longitude'];
231
+        $entity->isActive = (bool)$data['is_active_flag'];
232 232
         $entity->firstname = $data['first_name'];
233 233
         $entity->lastname = $data['last_name'];
234 234
         $entity->country = $data['country'];
Please login to merge, or discard this patch.
htdocs/lib2/logic/user.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
      */
27 27
     public static function fromEMail($email)
28 28
     {
29
-        $userId = (int) sql_value("SELECT `user_id` FROM `user` WHERE `email`='&1'", 0, $email);
29
+        $userId = (int)sql_value("SELECT `user_id` FROM `user` WHERE `email`='&1'", 0, $email);
30 30
         if ($userId === 0) {
31 31
             return null;
32 32
         }
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
      */
42 42
     public static function fromUsername($username)
43 43
     {
44
-        $userId = (int) sql_value("SELECT `user_id` FROM `user` WHERE `username`='&1'", 0, $username);
44
+        $userId = (int)sql_value("SELECT `user_id` FROM `user` WHERE `username`='&1'", 0, $username);
45 45
         if ($userId === 0) {
46 46
             return null;
47 47
         }
Please login to merge, or discard this patch.
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.