Completed
Push — develop ( 9f16e6...3b316f )
by Schlaefer
02:38
created
plugins/Installer/src/Lib/IntegrationTestCase.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types = 1);
3
+declare(strict_types=1);
4 4
 
5 5
 /**
6 6
  * Saito - The Threaded Web Forum
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
             'shouts',
55 55
         ];
56 56
         foreach ($tables as $table) {
57
-            $connection->execute('DROP TABLE IF EXISTS ' . $table . ';');
57
+            $connection->execute('DROP TABLE IF EXISTS '.$table.';');
58 58
         }
59 59
 
60 60
         // Tell the fixture manager that all tables are gone.
Please login to merge, or discard this patch.
bin/cake.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 #!/usr/bin/php -q
2 2
 <?php
3 3
 // Check platform requirements
4
-require dirname(__DIR__) . '/config/requirements.php';
5
-require dirname(__DIR__) . '/vendor/autoload.php';
4
+require dirname(__DIR__).'/config/requirements.php';
5
+require dirname(__DIR__).'/vendor/autoload.php';
6 6
 
7 7
 use App\Application;
8 8
 use Cake\Console\CommandRunner;
9 9
 
10 10
 // Build the runner with an application and root executable name.
11
-$runner = new CommandRunner(new Application(dirname(__DIR__) . '/config'), 'cake');
11
+$runner = new CommandRunner(new Application(dirname(__DIR__).'/config'), 'cake');
12 12
 exit($runner->run($argv));
Please login to merge, or discard this patch.
src/Auth/Mlf2PasswordHasher.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,8 +18,8 @@  discard block
 block discarded – undo
18 18
     {
19 19
         // compare to includes/functions.inc.php generate_pw_hash() mlf 2.3
20 20
         $salt = self::_generateRandomString(10);
21
-        $saltedHash = sha1($password . $salt);
22
-        $hashWithSalt = $saltedHash . $salt;
21
+        $saltedHash = sha1($password.$salt);
22
+        $hashWithSalt = $saltedHash.$salt;
23 23
 
24 24
         return $hashWithSalt;
25 25
     }
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
         // compare to includes/functions.inc.php is_pw_correct() mlf 2.3
50 50
         $saltedHash = substr($hash, 0, 40);
51 51
         $salt = substr($hash, 40, 10);
52
-        if (sha1($password . $salt) == $saltedHash) :
52
+        if (sha1($password.$salt) == $saltedHash) :
53 53
             $out = true;
54 54
         endif;
55 55
 
Please login to merge, or discard this patch.
src/View/Helper/AppHelper.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -30,6 +30,6 @@
 block discarded – undo
30 30
      */
31 31
     public static function tagId()
32 32
     {
33
-        return 'id' . static::$_tagId++;
33
+        return 'id'.static::$_tagId++;
34 34
     }
35 35
 }
Please login to merge, or discard this patch.
src/View/Helper/ParserHelper.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types = 1);
3
+declare(strict_types=1);
4 4
 
5 5
 /**
6 6
  * Saito - The Threaded Web Forum
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
         $defaults = ['return' => 'html', 'embed' => true, 'multimedia' => true, 'wrap' => true];
163 163
         $options += $defaults;
164 164
 
165
-        $cacheId = md5(serialize($options) . $string);
165
+        $cacheId = md5(serialize($options).$string);
166 166
         if (isset($this->_parserCache[$cacheId])) {
167 167
             $html = $this->_parserCache[$cacheId];
168 168
         } else {
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
             $this->_parserCache[$cacheId] = $html;
171 171
         }
172 172
         if ($options['return'] === 'html' && $options['wrap']) {
173
-            $html = '<div class="richtext">' . $html . '</div>';
173
+            $html = '<div class="richtext">'.$html.'</div>';
174 174
         }
175 175
         Stopwatch::stop('ParseHelper::parse()');
176 176
 
Please login to merge, or discard this patch.
src/View/Helper/TimeHHelper.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -78,12 +78,12 @@  discard block
 block discarded – undo
78 78
                 $timeDiffToUtc = $timeInTimezone->getOffset() / 3600;
79 79
 
80 80
                 if ($timeDiffToUtc > 0) {
81
-                    $timeDiffToUtc = '+' . $timeDiffToUtc;
81
+                    $timeDiffToUtc = '+'.$timeDiffToUtc;
82 82
                 }
83 83
 
84
-                $tz = $timeZoneTitle . ' – ' . $timeInTimezone->format('H:i');
84
+                $tz = $timeZoneTitle.' – '.$timeInTimezone->format('H:i');
85 85
                 if ($timeDiffToUtc !== 0) {
86
-                    $tz .= ' (' . $timeDiffToUtc . ')';
86
+                    $tz .= ' ('.$timeDiffToUtc.')';
87 87
                 }
88 88
 
89 89
                 $options[$groupTitle][$timeZoneTitle] = $tz;
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
             $time = strftime("%H:%M", $timestamp);
146 146
         } elseif ($timestamp > ($this->_today - 64800)) {
147 147
             // yesterday but in the last 18 hours
148
-            $time = __('yesterday') . ' ' . strftime("%H:%M", $timestamp);
148
+            $time = __('yesterday').' '.strftime("%H:%M", $timestamp);
149 149
         } else {
150 150
             // yesterday and 18 hours and older
151 151
             $time = strftime("%d.%m.%Y", $timestamp);
Please login to merge, or discard this patch.
src/View/Helper/UserHelper.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
             }
73 73
         }
74 74
 
75
-        return '<style type="text/css">' . implode(" ", $styles) . '</style>';
75
+        return '<style type="text/css">'.implode(" ", $styles).'</style>';
76 76
     }
77 77
 
78 78
     /**
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
         $link = $url;
126 126
 
127 127
         if (substr($link, 0, 4) == 'www.') {
128
-            $link = 'http://' . $link;
128
+            $link = 'http://'.$link;
129 129
         }
130 130
         if (substr($link, 0, 4) == 'http') {
131 131
             $text = '<i class="fa fa-home fa-lg"></i>';
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
             $html = $name;
161 161
         } elseif ($link || ($link instanceof ForumsUserInterface && $link->isLoggedIn())
162 162
         ) {
163
-            return $this->Html->link($name, '/users/view/' . $id, $options);
163
+            return $this->Html->link($name, '/users/view/'.$id, $options);
164 164
         } else {
165 165
             $html = $name;
166 166
         }
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
      */
181 181
     public function getAvatar($user, array $options = [])
182 182
     {
183
-        $getAvatar = function () use ($user, $options) {
183
+        $getAvatar = function() use ($user, $options) {
184 184
             Stopwatch::start('UserHelper::getAvatar()');
185 185
             $defaults = [
186 186
                 'class' => 'avatar-image',
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
                 $imgUri = (new Identicon)->getImageDataUri($name, $hdpi);
207 207
             }
208 208
 
209
-            $style = "background-image: url({$imgUri});" . $options['style'];
209
+            $style = "background-image: url({$imgUri});".$options['style'];
210 210
 
211 211
             $html = $this->Html->tag(
212 212
                 $options['tag'],
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
         };
228 228
 
229 229
         $name = $user->get('username');
230
-        $hash = 'avatar.' . md5($name . serialize($options));
230
+        $hash = 'avatar.'.md5($name.serialize($options));
231 231
 
232 232
         return $this->remember($hash, $getAvatar);
233 233
     }
Please login to merge, or discard this patch.
src/Controller/PreviewController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -68,9 +68,9 @@
 block discarded – undo
68 68
             $jsonApiErrors = ['errors' => []];
69 69
             foreach ($errors as $field => $error) {
70 70
                 $out = [
71
-                    'meta' => ['field' => '#' . $this->_domId($field)],
71
+                    'meta' => ['field' => '#'.$this->_domId($field)],
72 72
                     'status' => '400',
73
-                    'title' => __d('nondynamic', $field) . ": " . __d('nondynamic', current($error)),
73
+                    'title' => __d('nondynamic', $field).": ".__d('nondynamic', current($error)),
74 74
                 ];
75 75
 
76 76
                 $jsonApiErrors['errors'][] = $out;
Please login to merge, or discard this patch.
src/Controller/AppController.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -216,10 +216,10 @@
 block discarded – undo
216 216
             return;
217 217
         }
218 218
 
219
-        $check = function ($locale) {
220
-            $l10nViewPath = $this->viewBuilder()->getTemplatePath() . DS . $locale;
221
-            $l10nViewFile = $l10nViewPath . DS . $this->viewBuilder()->getName() . '.ctp';
222
-            if (!file_exists(APP . 'Template' . DS . $l10nViewFile)) {
219
+        $check = function($locale) {
220
+            $l10nViewPath = $this->viewBuilder()->getTemplatePath().DS.$locale;
221
+            $l10nViewFile = $l10nViewPath.DS.$this->viewBuilder()->getName().'.ctp';
222
+            if (!file_exists(APP.'Template'.DS.$l10nViewFile)) {
223 223
                 return false;
224 224
             }
225 225
 
Please login to merge, or discard this patch.