Completed
Pull Request — development (#914)
by
unknown
47s
created
htdocs/src/Oc/GeoCache/Persistence/GeoCacheLog/GeoCacheLogRepository.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
     public function fetchOneBy(array $where = []): ?GeoCacheLogEntity
65 65
     {
66 66
         $queryBuilder = $this->connection->createQueryBuilder()
67
-             ->select('*')
68
-             ->from(self::TABLE)
69
-             ->setMaxResults(1);
67
+                ->select('*')
68
+                ->from(self::TABLE)
69
+                ->setMaxResults(1);
70 70
 
71 71
         if (count($where) > 0) {
72 72
             foreach ($where as $column => $value) {
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
     public function fetchBy(array $where = []): array
95 95
     {
96 96
         $queryBuilder = $this->connection->createQueryBuilder()
97
-             ->select('*')
98
-             ->from(self::TABLE);
97
+                ->select('*')
98
+                ->from(self::TABLE);
99 99
 
100 100
         if (count($where) > 0) {
101 101
             foreach ($where as $column => $value) {
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
             $databaseArray
165 165
         );
166 166
 
167
-        $entity->id = (int) $this->connection->lastInsertId();
167
+        $entity->id = (int)$this->connection->lastInsertId();
168 168
 
169 169
         return $entity;
170 170
     }
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
             ['id' => $entity->id]
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
     }
@@ -250,27 +250,27 @@  discard block
 block discarded – undo
250 250
     public function getEntityFromDatabaseArray(array $data): GeoCacheLogEntity
251 251
     {
252 252
         $entity = new GeoCacheLogEntity();
253
-        $entity->id = (int) $data['id'];
253
+        $entity->id = (int)$data['id'];
254 254
         $entity->uuid = $data['uuid'];
255
-        $entity->node = (int) $data['node'];
255
+        $entity->node = (int)$data['node'];
256 256
         $entity->dateCreated = new DateTime($data['date_created']);
257 257
         $entity->entryLastModified = new DateTime($data['entry_last_modified']);
258 258
         $entity->lastModified = new DateTime($data['last_modified']);
259
-        $entity->okapiSyncbase = (int) $data['okapi_syncbase'];
259
+        $entity->okapiSyncbase = (int)$data['okapi_syncbase'];
260 260
         $entity->logLastModified = new DateTime($data['log_last_modified']);
261
-        $entity->cacheId = (int) $data['cache_id'];
262
-        $entity->userId = (int) $data['user_id'];
263
-        $entity->type = (int) $data['type'];
264
-        $entity->ocTeamComment = (bool) $data['oc_team_comment'];
261
+        $entity->cacheId = (int)$data['cache_id'];
262
+        $entity->userId = (int)$data['user_id'];
263
+        $entity->type = (int)$data['type'];
264
+        $entity->ocTeamComment = (bool)$data['oc_team_comment'];
265 265
         $entity->date = new DateTime($data['date']);
266 266
         $entity->orderDate = new DateTime($data['order_date']);
267
-        $entity->needsMaintenance = (bool) $data['needs_maintenance'];
268
-        $entity->listingOutdated = (bool) $data['listing_outdated'];
267
+        $entity->needsMaintenance = (bool)$data['needs_maintenance'];
268
+        $entity->listingOutdated = (bool)$data['listing_outdated'];
269 269
         $entity->text = $data['text'];
270
-        $entity->textHtml = (bool) $data['text_html'];
271
-        $entity->textHtmledit = (bool) $data['text_htmledit'];
272
-        $entity->ownerNotified = (bool) $data['owner_notified'];
273
-        $entity->picture = (int) $data['picture'];
270
+        $entity->textHtml = (bool)$data['text_html'];
271
+        $entity->textHtmledit = (bool)$data['text_htmledit'];
272
+        $entity->ownerNotified = (bool)$data['owner_notified'];
273
+        $entity->picture = (int)$data['picture'];
274 274
 
275 275
         return $entity;
276 276
     }
Please login to merge, or discard this patch.
htdocs/src/Oc/Postfix/LogEntity.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     public function toDatabaseArray(): array
28 28
     {
29 29
         return [
30
-            'id' => (int) $this->id,
30
+            'id' => (int)$this->id,
31 31
             'email' => $this->email,
32 32
             'status' => $this->status,
33 33
             'created' => $this->created,
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 
37 37
     public function fromDatabaseArray(array $data): self
38 38
     {
39
-        $this->id = (int) $data['id'];
39
+        $this->id = (int)$data['id'];
40 40
         $this->email = $data['email'];
41 41
         $this->status = $data['status'];
42 42
         $this->created = $data['created'];
Please login to merge, or discard this patch.
htdocs/src/Oc/Validator/Validator.php 1 patch
Indentation   -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,6 @@
 block discarded – undo
21 21
      * Validates a single item.
22 22
      *
23 23
      * @param mixed $item Item to validate
24
-
25 24
      * @throws ValidationException
26 25
      */
27 26
     public function validate($item): void
Please login to merge, or discard this patch.
htdocs/src/Oc/Validator/Exception/ValidationException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
     {
18 18
         $this->setViolations($violations);
19 19
 
20
-        parent::__construct((string) $this);
20
+        parent::__construct((string)$this);
21 21
     }
22 22
 
23 23
     public function __toString(): string
Please login to merge, or discard this patch.
htdocs/src/Oc/Command/CodeSnifferCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@
 block discarded – undo
72 72
         }
73 73
 
74 74
         $process = new Process($cmd, $this->rootPath, null, null, 9600);
75
-        $process->run(function ($type, $buffer): void {
75
+        $process->run(function($type, $buffer): void {
76 76
             echo $buffer;
77 77
         });
78 78
 
Please login to merge, or discard this patch.
htdocs/src/Oc/Command/CreateWebCacheCommand.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
         $filesJson = json_decode(file_get_contents($projectDir . '/theme/frontend/js/files.json'), true);
104 104
         $ownFiles = $filesJson['files'];
105 105
 
106
-        $ownFiles = array_map(function ($file) use ($applicationJsPath) {
106
+        $ownFiles = array_map(function($file) use ($applicationJsPath) {
107 107
             if (strpos($file, '**') !== false) {
108 108
                 return null;
109 109
             }
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
         $finder = new Finder();
117 117
         $finder->in($applicationJsPath . '/plugins/')->name('*.js');
118 118
 
119
-        $jsPlugins = array_map(function ($file) {
119
+        $jsPlugins = array_map(function($file) {
120 120
             return $file->getRealPath();
121 121
         }, iterator_to_array($finder->files()));
122 122
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
         $scss = new Compiler();
148 148
         $scss->setIgnoreErrors(true);
149 149
         $scss->addImportPath($applicationScssPath);
150
-        $scss->addImportPath(function ($path) use ($projectDir) {
150
+        $scss->addImportPath(function($path) use ($projectDir) {
151 151
             //Check for tilde as this refers to the node_modules dir
152 152
             if (strpos($path, '~') === 0) {
153 153
                 $path = str_replace(
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
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
     {
26 26
         [$uSec, $sec] = explode(' ', microtime());
27 27
 
28
-        return ((float) $uSec + (float) $sec);
28
+        return ((float)$uSec + (float)$sec);
29 29
     }
30 30
 
31 31
     /**
Please login to merge, or discard this patch.
htdocs/src/OcLegacy/Map/StaticMap.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
     /**
58 58
      * @var string
59 59
      */
60
-    private $tileCacheBaseDir =  __DIR__ . '/../../../var/cache2/staticmap';
60
+    private $tileCacheBaseDir = __DIR__ . '/../../../var/cache2/staticmap';
61 61
 
62 62
     /**
63 63
      * @var int
@@ -127,11 +127,11 @@  discard block
 block discarded – undo
127 127
 
128 128
         if (isset($_GET['size']) && !empty($_GET['size'])) {
129 129
             list($this->width, $this->height) = explode('x', $_GET['size']);
130
-            $this->width = (int) $this->width;
130
+            $this->width = (int)$this->width;
131 131
             if ($this->width > $this->maxWidth) {
132 132
                 $this->width = $this->maxWidth;
133 133
             }
134
-            $this->height = (int) $this->height;
134
+            $this->height = (int)$this->height;
135 135
             if ($this->height > $this->maxHeight) {
136 136
                 $this->height = $this->maxHeight;
137 137
             }
Please login to merge, or discard this patch.
htdocs/lib2/login.class.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,13 +15,13 @@  discard block
 block discarded – undo
15 15
 
16 16
 use OcLegacy\Util\PasswordCrypt;
17 17
 
18
-define('LOGIN_UNKNOWN_ERROR', -1);     // unknown error occurred
19
-define('LOGIN_OK', 0);                 // login succeeded
20
-define('LOGIN_BADUSERPW', 1);          // bad username or password
21
-define('LOGIN_TOOMUCHLOGINS', 2);      // too many logins in short time
22
-define('LOGIN_USERNOTACTIVE', 3);      // the userAccount locked
18
+define('LOGIN_UNKNOWN_ERROR', -1); // unknown error occurred
19
+define('LOGIN_OK', 0); // login succeeded
20
+define('LOGIN_BADUSERPW', 1); // bad username or password
21
+define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time
22
+define('LOGIN_USERNOTACTIVE', 3); // the userAccount locked
23 23
 define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty
24
-define('LOGIN_LOGOUT_OK', 5);          // logout was successful
24
+define('LOGIN_LOGOUT_OK', 5); // logout was successful
25 25
 
26 26
 // login times in seconds
27 27
 define('LOGIN_TIME', 60 * 60);
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 
70 70
         // TODO good input evaluation
71 71
         if ($cookie->is_set('userid') && $cookie->is_set('username')) {
72
-            $this->userid = (int) $cookie->get('userid');
72
+            $this->userid = (int)$cookie->get('userid');
73 73
             $this->username = $cookie->get('username');
74 74
             $this->permanent = (($cookie->get('permanent') + 0) == 1);
75 75
             $this->lastlogin = $cookie->get('lastlogin');
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
     public function pStoreCookie(): void
101 101
     {
102 102
         global $cookie;
103
-        $cookie->set('userid', (int) $this->userid);
103
+        $cookie->set('userid', (int)$this->userid);
104 104
         $cookie->set('username', $this->username);
105 105
         $cookie->set('permanent', ($this->permanent === true ? 1 : 0));
106 106
         $cookie->set('lastlogin', $this->lastlogin);
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
                     $rUser['user_id'],
295 295
                     ($permanent != false ? 1 : 0)
296 296
                 );
297
-                $this->userid = (int) $rUser['user_id'];
297
+                $this->userid = (int)$rUser['user_id'];
298 298
                 $this->username = $rUser['username'];
299 299
                 $this->permanent = $permanent;
300 300
                 $this->lastlogin = date('Y-m-d H:i:s');
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
             );
341 341
             if ($rUser = sql_fetch_assoc($rs)) {
342 342
                 $this->username = $rUser['username'];
343
-                $this->userid = (int) $rUser['user_id'];
343
+                $this->userid = (int)$rUser['user_id'];
344 344
                 $this->admin = $rUser['admin'];
345 345
                 $this->verified = true;
346 346
                 sqlf("UPDATE `user` SET `user`.`last_login`=NOW() WHERE `user`.`user_id`='&1'", $this->userid);
Please login to merge, or discard this patch.