Completed
Pull Request — master (#616)
by Richard
13:56
created
xoops_lib/Xoops/Core/SmartyBCTrait.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
      */
62 62
     public function assign_by_ref($tpl_var, &$value)
63 63
     {
64
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
64
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
65 65
         $this->assignByRef($tpl_var, $value);
66 66
     }
67 67
 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
      */
75 75
     public function append_by_ref($tpl_var, &$value, $merge = false)
76 76
     {
77
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
77
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
78 78
         $this->appendByRef($tpl_var, $value, $merge);
79 79
     }
80 80
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
      */
86 86
     public function clear_assign($tpl_var)
87 87
     {
88
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
88
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
89 89
         $this->clearAssign($tpl_var);
90 90
     }
91 91
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
      */
100 100
     public function register_function($function, $function_impl, $cacheable = true, $cache_attrs = null)
101 101
     {
102
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
102
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
103 103
         $this->registerPlugin('function', $function, $function_impl, $cacheable, $cache_attrs);
104 104
     }
105 105
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
      */
111 111
     public function unregister_function($function)
112 112
     {
113
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
113
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
114 114
         $this->unregisterPlugin('function', $function);
115 115
     }
116 116
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
      */
129 129
     public function register_object($object, $object_impl, $allowed = array(), $smarty_args = true, $block_methods = array())
130 130
     {
131
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
131
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
132 132
         settype($allowed, 'array');
133 133
         settype($smarty_args, 'boolean');
134 134
         $this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods);
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
      */
142 142
     public function unregister_object($object)
143 143
     {
144
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
144
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
145 145
         $this->unregisterObject($object);
146 146
     }
147 147
 
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
      */
156 156
     public function register_block($block, $block_impl, $cacheable = true, $cache_attrs = null)
157 157
     {
158
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
158
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
159 159
         $this->registerPlugin('block', $block, $block_impl, $cacheable, $cache_attrs);
160 160
     }
161 161
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
      */
167 167
     public function unregister_block($block)
168 168
     {
169
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
169
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
170 170
         $this->unregisterPlugin('block', $block);
171 171
     }
172 172
 
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
      */
180 180
     public function register_compiler_function($function, $function_impl, $cacheable = true)
181 181
     {
182
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
182
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
183 183
         $this->registerPlugin('compiler', $function, $function_impl, $cacheable);
184 184
     }
185 185
 
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
      */
191 191
     public function unregister_compiler_function($function)
192 192
     {
193
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
193
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
194 194
         $this->unregisterPlugin('compiler', $function);
195 195
     }
196 196
 
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
      */
203 203
     public function register_modifier($modifier, $modifier_impl)
204 204
     {
205
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
205
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
206 206
         $this->registerPlugin('modifier', $modifier, $modifier_impl);
207 207
     }
208 208
 
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
      */
214 214
     public function unregister_modifier($modifier)
215 215
     {
216
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
216
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
217 217
         $this->unregisterPlugin('modifier', $modifier);
218 218
     }
219 219
 
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
      */
226 226
     public function register_resource($type, $functions)
227 227
     {
228
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
228
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
229 229
         $this->registerResource($type, $functions);
230 230
     }
231 231
 
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
      */
237 237
     public function unregister_resource($type)
238 238
     {
239
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
239
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
240 240
         $this->unregisterResource($type);
241 241
     }
242 242
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
      */
249 249
     public function register_prefilter($function)
250 250
     {
251
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
251
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
252 252
         $this->registerFilter('pre', $function);
253 253
     }
254 254
 
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
      */
260 260
     public function unregister_prefilter($function)
261 261
     {
262
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
262
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
263 263
         $this->unregisterFilter('pre', $function);
264 264
     }
265 265
 
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
      */
272 272
     public function register_postfilter($function)
273 273
     {
274
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
274
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
275 275
         $this->registerFilter('post', $function);
276 276
     }
277 277
 
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
      */
283 283
     public function unregister_postfilter($function)
284 284
     {
285
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
285
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
286 286
         $this->unregisterFilter('post', $function);
287 287
     }
288 288
 
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
      */
295 295
     public function register_outputfilter($function)
296 296
     {
297
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
297
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
298 298
         $this->registerFilter('output', $function);
299 299
     }
300 300
 
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
      */
306 306
     public function unregister_outputfilter($function)
307 307
     {
308
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
308
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
309 309
         $this->unregisterFilter('output', $function);
310 310
     }
311 311
 
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
      */
318 318
     public function load_filter($type, $name)
319 319
     {
320
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
320
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
321 321
         $this->loadFilter($type, $name);
322 322
     }
323 323
 
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
      */
334 334
     public function clear_cache($tpl_file = null, $cache_id = null, $compile_id = null, $exp_time = null)
335 335
     {
336
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
336
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
337 337
         return $this->clearCache($tpl_file, $cache_id, $compile_id, $exp_time);
338 338
     }
339 339
 
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
      */
347 347
     public function clear_all_cache($exp_time = null)
348 348
     {
349
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
349
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
350 350
         return $this->clearCache(null, null, null, $exp_time);
351 351
     }
352 352
 
@@ -361,7 +361,7 @@  discard block
 block discarded – undo
361 361
      */
362 362
     public function is_cached($tpl_file, $cache_id = null, $compile_id = null)
363 363
     {
364
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
364
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
365 365
         return $this->isCached($tpl_file, $cache_id, $compile_id);
366 366
     }
367 367
 
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
      */
371 371
     public function clear_all_assign()
372 372
     {
373
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
373
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
374 374
         $this->clearAllAssign();
375 375
     }
376 376
 
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
      */
388 388
     public function clear_compiled_tpl($tpl_file = null, $compile_id = null, $exp_time = null)
389 389
     {
390
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
390
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
391 391
         return $this->clearCompiledTemplate($tpl_file, $compile_id, $exp_time);
392 392
     }
393 393
 
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
      */
401 401
     public function template_exists($tpl_file)
402 402
     {
403
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
403
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
404 404
         return $this->templateExists($tpl_file);
405 405
     }
406 406
 
@@ -413,7 +413,7 @@  discard block
 block discarded – undo
413 413
      */
414 414
     public function get_template_vars($name = null)
415 415
     {
416
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
416
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
417 417
         return $this->getTemplateVars($name);
418 418
     }
419 419
 
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
      */
427 427
     public function get_config_vars($name = null)
428 428
     {
429
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
429
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
430 430
         return $this->getConfigVars($name);
431 431
     }
432 432
 
@@ -439,7 +439,7 @@  discard block
 block discarded – undo
439 439
      */
440 440
     public function config_load($file, $section = null, $scope = 'global')
441 441
     {
442
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
442
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
443 443
         $this->configLoad($file, $section, $scope);
444 444
     }
445 445
 
@@ -452,7 +452,7 @@  discard block
 block discarded – undo
452 452
      */
453 453
     public function get_registered_object($name)
454 454
     {
455
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
455
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
456 456
         return $this->getRegisteredObject($name);
457 457
     }
458 458
 
@@ -463,7 +463,7 @@  discard block
 block discarded – undo
463 463
      */
464 464
     public function clear_config($var = null)
465 465
     {
466
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
466
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
467 467
         $this->clearConfig($var);
468 468
     }
469 469
 
@@ -475,7 +475,7 @@  discard block
 block discarded – undo
475 475
      */
476 476
     public function trigger_error($error_msg, $error_type = E_USER_WARNING)
477 477
     {
478
-        $this->deprecated(__METHOD__, __FILE__, (__LINE__ + 1));
478
+        $this->deprecated(__METHOD__, __FILE__, (__LINE__ +1));
479 479
         trigger_error("Smarty error: $error_msg", $error_type);
480 480
     }
481 481
 
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Handler/Scheme/LegacyModule.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,11 +40,11 @@
 block discarded – undo
40 40
         $name = strtolower($spec->getName());
41 41
         $dirname = strtolower($spec->getDirname());
42 42
 
43
-        $handlerFile = \XoopsBaseConfig::get('root-path') . "/modules/{$dirname}/class/{$name}.php";
43
+        $handlerFile = \XoopsBaseConfig::get('root-path')."/modules/{$dirname}/class/{$name}.php";
44 44
         if (\XoopsLoad::fileExists($handlerFile)) {
45 45
             include_once $handlerFile;
46 46
         }
47
-        $class = ucfirst($dirname) . ucfirst($name) . 'Handler';
47
+        $class = ucfirst($dirname).ucfirst($name).'Handler';
48 48
         if (class_exists($class, false)) {
49 49
             $handler = new $class($spec->getFactory()->db());
50 50
         }
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Handler/Scheme/Kernel.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@
 block discarded – undo
65 65
         }
66 66
 
67 67
         $name = $this->lookupTable[$specName];
68
-        $class = '\Xoops\Core\Kernel\Handlers\Xoops' . $name . 'Handler';
68
+        $class = '\Xoops\Core\Kernel\Handlers\Xoops'.$name.'Handler';
69 69
         if (class_exists($class)) {
70 70
             $handler = new $class($spec->getFactory()->db());
71 71
         }
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Handler/FactorySpec.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
      */
105 105
     public function optional($value)
106 106
     {
107
-        $this->specOptional = (bool) $value;
107
+        $this->specOptional = (bool)$value;
108 108
         return $this;
109 109
     }
110 110
 
Please login to merge, or discard this patch.
xoops_lib/Xoops/Core/Handler/Factory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@
 block discarded – undo
115 115
         $foundColon = strpos($name, ':');
116 116
         if ($foundColon !== false) {
117 117
             $scheme = substr($name, 0, $foundColon);
118
-            $baseName = substr($name, $foundColon+1);
118
+            $baseName = substr($name, $foundColon + 1);
119 119
             $handler = $this->newSpec()->scheme($scheme)->name($baseName)->optional($optional)->build();
120 120
             return $handler;
121 121
         }
Please login to merge, or discard this patch.
xoops_lib/Xoops/Form/Tab.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -55,14 +55,14 @@
 block discarded – undo
55 55
             }
56 56
             if (!$ele->isHidden()) {
57 57
                 $ret .= '<div class="form-group">';
58
-                $ret .= '<label>' . $ele->getCaption();
59
-                $ret .= ($ele->isRequired() ? '<span class="caption-required">*</span>' : '') . '</label>';
58
+                $ret .= '<label>'.$ele->getCaption();
59
+                $ret .= ($ele->isRequired() ? '<span class="caption-required">*</span>' : '').'</label>';
60 60
                 $ret .= $ele->render();
61
-                $ret .= '<small class="text-muted">' . $ele->getDescription() . '</small>';
62
-                $ret .= '<p class="dsc_pattern_vertical">' . $ele->getPatternDescription() . '</p>';
63
-                $ret .= '</div>' . "\n";
61
+                $ret .= '<small class="text-muted">'.$ele->getDescription().'</small>';
62
+                $ret .= '<p class="dsc_pattern_vertical">'.$ele->getPatternDescription().'</p>';
63
+                $ret .= '</div>'."\n";
64 64
             } else {
65
-                $ret .= $ele->render(). "\n";
65
+                $ret .= $ele->render()."\n";
66 66
             }
67 67
         }
68 68
         return $ret;
Please login to merge, or discard this patch.
xoops_lib/Xoops/Form/File.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -50,8 +50,8 @@
 block discarded – undo
50 50
     {
51 51
         $attributes = $this->renderAttributeString();
52 52
 
53
-        return '<input ' . $attributes . ' ' . $this->getExtra() . ' />'
53
+        return '<input '.$attributes.' '.$this->getExtra().' />'
54 54
             . '<input type="hidden" name="xoops_upload_file[]" id="xoops_upload_file[]" value="'
55
-            . $this->getName() . '">';
55
+            . $this->getName().'">';
56 56
     }
57 57
 }
Please login to merge, or discard this patch.
xoops_lib/Xoops/Form/Label.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
     {
54 54
         $this->suppressRender(['name', 'value']);
55 55
         $attributes = $this->renderAttributeString();
56
-        $ret = '<div ' . $attributes . '>' . $this->getValue() . '</div>';
56
+        $ret = '<div '.$attributes.'>'.$this->getValue().'</div>';
57 57
         return $ret;
58 58
     }
59 59
 }
Please login to merge, or discard this patch.
xoops_lib/Xoops/Form/ThemeForm.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -35,14 +35,14 @@  discard block
 block discarded – undo
35 35
      */
36 36
     public function insertBreak($extra = '', $class = '')
37 37
     {
38
-        $class = ($class != '' ? " class=\"" . $class . "\"" : " class=\"break\"");
38
+        $class = ($class != '' ? " class=\"".$class."\"" : " class=\"break\"");
39 39
         // Fix for $extra tag not showing
40 40
         if ($extra) {
41
-            $value = '<div' . $class . '>' . $extra . '</div>';
41
+            $value = '<div'.$class.'>'.$extra.'</div>';
42 42
             $ele = new Raw($value);
43 43
             $this->addElement($ele);
44 44
         } else {
45
-            $value = '<div' . $class . '>&nbsp;</div>';
45
+            $value = '<div'.$class.'>&nbsp;</div>';
46 46
             $ele = new Raw($value);
47 47
             $this->addElement($ele);
48 48
         }
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
                 $xoops->tpl()->appendByRef('xo_input', $input);
96 96
                 unset($input);
97 97
             } else {
98
-                $hidden .= $ele->render(). "\n";
98
+                $hidden .= $ele->render()."\n";
99 99
             }
100 100
 
101 101
         }
Please login to merge, or discard this patch.