Completed
Push — develop ( 9f16e6...3b316f )
by Schlaefer
02:38
created
plugins/Admin/src/Plugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 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
Please login to merge, or discard this patch.
plugins/Commonmark/src/Plugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 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
Please login to merge, or discard this patch.
plugins/Detectors/src/Plugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 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
Please login to merge, or discard this patch.
plugins/Cron/src/Plugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 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
Please login to merge, or discard this patch.
plugins/Stopwatch/src/Plugin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 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
Please login to merge, or discard this patch.
src/View/Helper/PostingHelper.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -55,12 +55,12 @@  discard block
 block discarded – undo
55 55
         if ($lastAction !== 'add') {
56 56
             $session = $this->getView()->getRequest()->getSession();
57 57
             if ($session->read('paginator.lastPage')) {
58
-                $params[] = 'page=' . $session->read('paginator.lastPage');
58
+                $params[] = 'page='.$session->read('paginator.lastPage');
59 59
             }
60 60
         }
61
-        $params[] = 'jump=' . $tid;
61
+        $params[] = 'jump='.$tid;
62 62
 
63
-        return '/?' . implode('&', $params);
63
+        return '/?'.implode('&', $params);
64 64
     }
65 65
 
66 66
     /**
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
         $id = $posting->get('id');
77 77
         $webroot = $this->getView()->getRequest()->getAttribute('webroot');
78 78
         $url = "{$webroot}entries/view/{$id}";
79
-        $link = "<a href=\"{$url}\" class=\"{$options['class']}\">" . $this->getSubject($posting) . '</a>';
79
+        $link = "<a href=\"{$url}\" class=\"{$options['class']}\">".$this->getSubject($posting).'</a>';
80 80
 
81 81
         return $link;
82 82
     }
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
      */
132 132
     public function views(BasicPostingInterface $posting)
133 133
     {
134
-        return __('views_headline') . ': ' . $posting->get('views');
134
+        return __('views_headline').': '.$posting->get('views');
135 135
     }
136 136
 
137 137
     /**
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
     {
148 148
         $options += [
149 149
             'lineCache' => $this->_View->get('LineCache'),
150
-            'maxThreadDepthIndent' => (int)Configure::read(
150
+            'maxThreadDepthIndent' => (int) Configure::read(
151 151
                 'Saito.Settings.thread_depth_indent'
152 152
             ),
153 153
             'renderer' => 'thread',
@@ -190,10 +190,10 @@  discard block
 block discarded – undo
190 190
     {
191 191
         $out = '';
192 192
         if ($entry->isPinned()) {
193
-            $out .= '<i class="fa fa-thumb-tack" title="' . __('fixed') . '"></i> ';
193
+            $out .= '<i class="fa fa-thumb-tack" title="'.__('fixed').'"></i> ';
194 194
         }
195 195
         // anchor for inserting solve-icon via FE-JS
196
-        $out .= '<span class="solves ' . $entry->get('id') . '">';
196
+        $out .= '<span class="solves '.$entry->get('id').'">';
197 197
         if ($entry->get('solves')) {
198 198
             $out .= $this->solvedBadge();
199 199
         }
@@ -217,8 +217,8 @@  discard block
 block discarded – undo
217 217
      */
218 218
     public function solvedBadge()
219 219
     {
220
-        return '<i class="fa fa-badge-solves solves-isSolved" title="' .
221
-        __('Helpful entry') . '"></i>';
220
+        return '<i class="fa fa-badge-solves solves-isSolved" title="'.
221
+        __('Helpful entry').'"></i>';
222 222
     }
223 223
 
224 224
     /**
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
      */
231 231
     public function getSubject(BasicPostingInterface $posting)
232 232
     {
233
-        return \h($posting->get('subject')) . ($posting->isNt() ? ' n/t' : '');
233
+        return \h($posting->get('subject')).($posting->isNt() ? ' n/t' : '');
234 234
     }
235 235
 
236 236
     /**
Please login to merge, or discard this patch.
src/View/Helper/JsDataHelper.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
                 'version' => Configure::read('Saito.v'),
64 64
                 'settings' => [
65 65
                     'autoPageReload' => (isset($View->viewVars['autoPageReload']) ? $View->viewVars['autoPageReload'] : 0),
66
-                    'editPeriod' => (int)Configure::read(
66
+                    'editPeriod' => (int) Configure::read(
67 67
                         'Saito.Settings.edit_period'
68 68
                     ),
69 69
                     'language' => Configure::read('Saito.language'),
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
77 77
                     'quote_symbol' => $settings['quote_symbol'],
78 78
                     'subject_maxlength' => $settings['subject_maxlength'],
79 79
                     'upload_max_img_size' => $settings['upload_max_img_size'] * 1024,
80
-                    'upload_max_number_of_uploads' => (int)$settings['upload_max_number_of_uploads'],
80
+                    'upload_max_number_of_uploads' => (int) $settings['upload_max_number_of_uploads'],
81 81
                     'theme' => $View->getTheme(),
82
-                    'apiroot' => $request->getAttribute('webroot') . 'api/v2/',
82
+                    'apiroot' => $request->getAttribute('webroot').'api/v2/',
83 83
                     'webroot' => $request->getAttribute('webroot')
84 84
                 ]
85 85
             ],
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
                 'csrf' => $this->_getCsrf($View)
92 92
             ],
93 93
             'currentUser' => [
94
-                'id' => (int)$CurrentUser->get('id'),
94
+                'id' => (int) $CurrentUser->get('id'),
95 95
                 'username' => $CurrentUser->get('username'),
96 96
                 'user_show_inline' => $CurrentUser->get('inline_view_on_click') || false,
97 97
                 'user_show_thread_collapsed' => $CurrentUser->get('user_show_thread_collapsed') || false
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
                 'afterViewInit' => []
103 103
             ]
104 104
         ];
105
-        $out = 'var SaitoApp = ' . json_encode($js);
105
+        $out = 'var SaitoApp = '.json_encode($js);
106 106
         $out .= '; SaitoApp.timeAppStart = new Date().getTime();';
107 107
 
108 108
         return $out;
Please login to merge, or discard this patch.
config/bootstrap.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 /*
17 17
  * Configure paths required to find CakePHP + general filepath constants
18 18
  */
19
-require __DIR__ . '/paths.php';
19
+require __DIR__.'/paths.php';
20 20
 
21 21
 /*
22 22
  * Bootstrap CakePHP.
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
  * - Registering the CakePHP autoloader.
28 28
  * - Setting the default application paths.
29 29
  */
30
-require CORE_PATH . 'config' . DS . 'bootstrap.php';
30
+require CORE_PATH.'config'.DS.'bootstrap.php';
31 31
 
32 32
 use Cake\Cache\Cache;
33 33
 use Cake\Console\ConsoleErrorHandler;
@@ -51,8 +51,8 @@  discard block
 block discarded – undo
51 51
  * You should copy `config/.env.default to `config/.env` and set/modify the
52 52
  * variables as required.
53 53
  */
54
-if (!env('APP_NAME') && file_exists(CONFIG . '.env')) {
55
-    $dotenv = new \josegonzalez\Dotenv\Loader([CONFIG . '.env']);
54
+if (!env('APP_NAME') && file_exists(CONFIG.'.env')) {
55
+    $dotenv = new \josegonzalez\Dotenv\Loader([CONFIG.'.env']);
56 56
     $dotenv->parse()
57 57
         ->putenv()
58 58
         ->toEnv()
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
      * Load additional config files
76 76
      */
77 77
     Configure::load('saito_config', 'default');
78
-    Configure::config('saitoCore', new PhpConfig(APP . '/Lib/'));
78
+    Configure::config('saitoCore', new PhpConfig(APP.'/Lib/'));
79 79
     Configure::load('version', 'saitoCore');
80 80
 
81 81
     Configure::write(
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
     Configure::load('email', 'default');
87 87
 } catch (\Exception $e) {
88
-    exit($e->getMessage() . "\n");
88
+    exit($e->getMessage()."\n");
89 89
 }
90 90
 
91 91
 /*
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
  * Include the CLI bootstrap overrides.
138 138
  */
139 139
 if ($isCli) {
140
-    require __DIR__ . '/bootstrap_cli.php';
140
+    require __DIR__.'/bootstrap_cli.php';
141 141
 }
142 142
 
143 143
 /*
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 
155 155
     $httpHost = env('HTTP_HOST');
156 156
     if (isset($httpHost)) {
157
-        Configure::write('App.fullBaseUrl', 'http' . $s . '://' . $httpHost);
157
+        Configure::write('App.fullBaseUrl', 'http'.$s.'://'.$httpHost);
158 158
     }
159 159
     unset($httpHost, $s);
160 160
 }
@@ -176,12 +176,12 @@  discard block
 block discarded – undo
176 176
 /*
177 177
  * Setup detectors for mobile and tablet.
178 178
  */
179
-ServerRequest::addDetector('mobile', function ($request) {
179
+ServerRequest::addDetector('mobile', function($request) {
180 180
     $detector = new \Detection\MobileDetect();
181 181
 
182 182
     return $detector->isMobile();
183 183
 });
184
-ServerRequest::addDetector('tablet', function ($request) {
184
+ServerRequest::addDetector('tablet', function($request) {
185 185
     $detector = new \Detection\MobileDetect();
186 186
 
187 187
     return $detector->isTablet();
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
 Inflector::rules('plural', ['/^(smil)ey$/i' => '\1ies']);
221 221
 Inflector::rules('singular', ['/^(smil)ies$/i' => '\1ey']);
222 222
 
223
-include Cake\Core\App::path('Lib')[0] . 'BaseFunctions.php';
223
+include Cake\Core\App::path('Lib')[0].'BaseFunctions.php';
224 224
 
225 225
 \Cake\Event\EventManager::instance()->on(\Saito\Event\SaitoEventManager::getInstance());
226 226
 
Please login to merge, or discard this patch.
plugins/Admin/src/View/Helper/AdminHelper.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
     {
100 100
         $options += ['class' => ''];
101 101
         // set breadcrumb item class for Bootstrap
102
-        $options['class'] = $options['class'] . ' breadcrumb-item';
102
+        $options['class'] = $options['class'].' breadcrumb-item';
103 103
         // last item in breadcrump is current (active) page and not linked
104 104
         if ($url === false) {
105 105
             // set breadcrumb active item class for Bootstrap
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
             PREG_SPLIT_NO_EMPTY
128 128
         );
129 129
         if (empty($errors)) {
130
-            return '<p>' . __('No log file found.') . '</p>';
130
+            return '<p>'.__('No log file found.').'</p>';
131 131
         }
132 132
 
133 133
         $out = '';
@@ -138,11 +138,11 @@  discard block
 block discarded – undo
138 138
             $_i = self::tagId();
139 139
             $_details = $e->details();
140 140
             if (!empty($_details)) {
141
-                $out .= '<button class="btn btn-mini" style="float:right;" onclick="$(\'#' . $_i . '\').toggle(); return false;">' . __(
141
+                $out .= '<button class="btn btn-mini" style="float:right;" onclick="$(\'#'.$_i.'\').toggle(); return false;">'.__(
142 142
                     'Details'
143
-                ) . '</button>' . "\n";
143
+                ).'</button>'."\n";
144 144
             }
145
-            $out .= '<pre style="font-size: 10px;">' . "\n";
145
+            $out .= '<pre style="font-size: 10px;">'."\n";
146 146
             $out .= '<div class="row"><div class="span2" style="text-align: right">';
147 147
             $out .= $this->TimeH->formatTime($e->time(), 'eng');
148 148
 
@@ -150,12 +150,12 @@  discard block
 block discarded – undo
150 150
             $out .= '<div class="span7">';
151 151
             $out .= $e->message();
152 152
             if (!empty($_details)) {
153
-                $out .= '<span id="' . $_i . '" style="display: none;">' . "\n";
153
+                $out .= '<span id="'.$_i.'" style="display: none;">'."\n";
154 154
                 $out .= $_details;
155 155
                 $out .= '</span>';
156 156
             }
157 157
             $out .= '</div></div>';
158
-            $out .= '</pre>' . "\n";
158
+            $out .= '</pre>'."\n";
159 159
             if ($k++ > $_nErrorsToShow) {
160 160
                 break;
161 161
             }
Please login to merge, or discard this patch.