@@ -319,7 +319,7 @@ |
||
319 | 319 | 1. <g>--TEST--</g> is not required and not even used (files names are used instead) |
320 | 320 | 2. Only sub-set of sections supported and only sub-set of <g>--EXPECTF--</g> tags |
321 | 321 | 3. <g>--EXPECT*--</g> sections are interpreted as code and its output is used as expected result |
322 | -HTML |
|
322 | +html |
|
323 | 323 | ); |
324 | 324 | exit; |
325 | 325 | } |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | $expect = rtrim(execute_code($working_dir, $parsed_test['EXPECT'], $php_arguments, $script_arguments)); |
112 | 112 | if ($expect === $output) { |
113 | 113 | line("<g>$base_text SUCCESS</g>", true); |
114 | - isset($parsed_test['CLEAN']) && execute_code($working_dir, $parsed_test['CLEAN'], $php_arguments, $script_arguments);; |
|
114 | + isset($parsed_test['CLEAN']) && execute_code($working_dir, $parsed_test['CLEAN'], $php_arguments, $script_arguments); ; |
|
115 | 115 | return 'success'; |
116 | 116 | } |
117 | 117 | $expect = $parsed_test['EXPECT']; |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | ); |
147 | 147 | if (preg_match("/^$regex\$/s", $output)) { |
148 | 148 | line("<g>$base_text SUCCESS</g>", true); |
149 | - isset($parsed_test['CLEAN']) && execute_code($working_dir, $parsed_test['CLEAN'], $php_arguments, $script_arguments);; |
|
149 | + isset($parsed_test['CLEAN']) && execute_code($working_dir, $parsed_test['CLEAN'], $php_arguments, $script_arguments); ; |
|
150 | 150 | return 'success'; |
151 | 151 | } |
152 | 152 | $expect = $parsed_test['EXPECTF']; |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | $regex = preg_quote($expect, '/'); |
156 | 156 | if (preg_match("/^$regex\$/s", $output)) { |
157 | 157 | line("<g>$base_text SUCCESS</g>", true); |
158 | - isset($parsed_test['CLEAN']) && execute_code($working_dir, $parsed_test['CLEAN'], $php_arguments, $script_arguments);; |
|
158 | + isset($parsed_test['CLEAN']) && execute_code($working_dir, $parsed_test['CLEAN'], $php_arguments, $script_arguments); ; |
|
159 | 159 | return 'success'; |
160 | 160 | } |
161 | 161 | } |
@@ -273,7 +273,7 @@ discard block |
||
273 | 273 | ); |
274 | 274 | $base_target_file_name = basename($base_target_file_path); |
275 | 275 | // Replace first script with combined file |
276 | - $data = str_replace( |
|
276 | + $data = str_replace( |
|
277 | 277 | $scripts_to_replace[0], |
278 | 278 | "<script src=\"$base_target_file_name.js?$content_md5\"></script>", |
279 | 279 | $data |
@@ -377,7 +377,7 @@ discard block |
||
377 | 377 | ); |
378 | 378 | $base_target_file_name = basename($base_target_file_path); |
379 | 379 | // Replace first link or style with combined file |
380 | - $data = str_replace( |
|
380 | + $data = str_replace( |
|
381 | 381 | $links_and_styles_to_replace[0], |
382 | 382 | "<link rel=\"import\" type=\"css\" href=\"$base_target_file_name.css?$content_md5\">", |
383 | 383 | $data |
@@ -101,7 +101,7 @@ |
||
101 | 101 | 'alias' => "cs\\custom\\$_custom_class", |
102 | 102 | 'path' => $custom_class |
103 | 103 | ]; |
104 | - $next_alias = "cs\\custom\\$custom_class"; |
|
104 | + $next_alias = "cs\\custom\\$custom_class"; |
|
105 | 105 | } |
106 | 106 | $modified_classes[$class] = [ |
107 | 107 | 'aliases' => $aliases, |
@@ -22,7 +22,7 @@ |
||
22 | 22 | if ($User->guest()) { |
23 | 23 | throw new ExitException(403); |
24 | 24 | } |
25 | - $fields = [ |
|
25 | + $fields = [ |
|
26 | 26 | 'id', |
27 | 27 | 'login', |
28 | 28 | 'username', |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | protected $shortname; |
27 | 27 | |
28 | 28 | protected function construct () { |
29 | - $this->shortname = Config::instance()->module('Disqus')->shortname; |
|
29 | + $this->shortname = Config::instance()->module('Disqus')->shortname; |
|
30 | 30 | } |
31 | 31 | /** |
32 | 32 | * Count of comments for specified item |
@@ -65,11 +65,11 @@ discard block |
||
65 | 65 | return '<div id="disqus_thread"></div>'; |
66 | 66 | } |
67 | 67 | protected function count_js () { |
68 | - static $added = false; |
|
68 | + static $added = false; |
|
69 | 69 | if ($added) { |
70 | 70 | return; |
71 | 71 | } |
72 | - $added = true; |
|
72 | + $added = true; |
|
73 | 73 | Page::instance()->js( |
74 | 74 | "var disqus_shortname = '$this->shortname'; |
75 | 75 | if (!window.disqus_count_items) { window.disqus_count_items = []; }", |
@@ -77,11 +77,11 @@ discard block |
||
77 | 77 | ); |
78 | 78 | } |
79 | 79 | protected function block_js ($item, $module) { |
80 | - static $added = false; |
|
80 | + static $added = false; |
|
81 | 81 | if ($added) { |
82 | 82 | return; |
83 | 83 | } |
84 | - $added = true; |
|
84 | + $added = true; |
|
85 | 85 | Page::instance()->js( |
86 | 86 | "var disqus_shortname = '$this->shortname', disqus_identifier = '".str_replace("'", "'", "$module/$item")."';", |
87 | 87 | 'code' |
@@ -216,12 +216,12 @@ discard block |
||
216 | 216 | * @return false|array |
217 | 217 | */ |
218 | 218 | function tree_data ($item, $module, $parent = 0) { |
219 | - $Cache = $this->cache; |
|
220 | - $L = Language::instance(); |
|
219 | + $Cache = $this->cache; |
|
220 | + $L = Language::instance(); |
|
221 | 221 | if (($comments = $Cache->{"$module/$item/$L->clang"}) === false) { |
222 | - $item = (int)$item; |
|
223 | - $parent = (int)$parent; |
|
224 | - $comments = $this->db()->qfa( |
|
222 | + $item = (int)$item; |
|
223 | + $parent = (int)$parent; |
|
224 | + $comments = $this->db()->qfa( |
|
225 | 225 | "SELECT |
226 | 226 | `id`, |
227 | 227 | `parent`, |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | * Cache only root tree data |
249 | 249 | */ |
250 | 250 | if ($parent == 0) { |
251 | - $Cache->{"$module/$item/$L->clang"} = $comments; |
|
251 | + $Cache->{"$module/$item/$L->clang"} = $comments; |
|
252 | 252 | } |
253 | 253 | } |
254 | 254 | return $comments; |
@@ -261,15 +261,15 @@ discard block |
||
261 | 261 | * @return string |
262 | 262 | */ |
263 | 263 | function tree_html ($comments) { |
264 | - $L = Language::instance(); |
|
265 | - $User = User::instance(); |
|
264 | + $L = Language::instance(); |
|
265 | + $User = User::instance(); |
|
266 | 266 | if (!is_array($comments) || !$comments) { |
267 | 267 | return ''; |
268 | 268 | } |
269 | - $content = ''; |
|
269 | + $content = ''; |
|
270 | 270 | foreach ($comments as $comment) { |
271 | - $uniqid = uniqid('comment_', true); |
|
272 | - $content .= str_replace($uniqid, $comment['text'], h::{'article.cs-comments-comment'}( |
|
271 | + $uniqid = uniqid('comment_', true); |
|
272 | + $content .= str_replace($uniqid, $comment['text'], h::{'article.cs-comments-comment'}( |
|
273 | 273 | h::{'img.cs-comments-comment-avatar'}([ |
274 | 274 | 'src' => $User->avatar($this->avatar_size, $comment['user']), |
275 | 275 | 'alt' => $User->username($comment['user']), |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | * @return string |
327 | 327 | */ |
328 | 328 | function block ($item, $module) { |
329 | - $L = Language::prefix('comments_'); |
|
329 | + $L = Language::prefix('comments_'); |
|
330 | 330 | return h::{'section#comments.cs-comments-comments'}( |
331 | 331 | $L->comments.':'. |
332 | 332 | ( |
@@ -43,7 +43,7 @@ |
||
43 | 43 | "public_key" : "@public_key" |
44 | 44 | } |
45 | 45 | |
46 | -CONFIG; |
|
46 | +config; |
|
47 | 47 | /** |
48 | 48 | * @param string $source |
49 | 49 | * @param string $target |
@@ -154,10 +154,10 @@ discard block |
||
154 | 154 | * Try to load classes from different places. If not found in one place - try in another. |
155 | 155 | */ |
156 | 156 | if ( |
157 | - strlen($file = @$file_index_map[str_replace('//', '/', "core/classes/$namespace/$class_name.php")]) || //Core classes |
|
157 | + strlen($file = @$file_index_map[str_replace('//', '/', "core/classes/$namespace/$class_name.php")]) || //Core classes |
|
158 | 158 | strlen($file = @$file_index_map[str_replace('//', '/', "core/thirdparty/$namespace/$class_name.php")]) || //Third party classes |
159 | - strlen($file = @$file_index_map[str_replace('//', '/', "core/traits/$namespace/$class_name.php")]) || //Core traits |
|
160 | - strlen($file = @$file_index_map[str_replace('//', '/', "core/engines/$namespace/$class_name.php")]) || //Core engines |
|
159 | + strlen($file = @$file_index_map[str_replace('//', '/', "core/traits/$namespace/$class_name.php")]) || //Core traits |
|
160 | + strlen($file = @$file_index_map[str_replace('//', '/', "core/engines/$namespace/$class_name.php")]) || //Core engines |
|
161 | 161 | strlen($file = @$file_index_map[str_replace('//', '/', "components/$namespace/$class_name.php")]) //Classes in modules and plugins |
162 | 162 | ) { |
163 | 163 | /** @noinspection UntrustedInclusionInspection */ |
@@ -279,7 +279,7 @@ discard block |
||
279 | 279 | * @throws Exception |
280 | 280 | */ |
281 | 281 | protected static function initialize_system_config ($cdb, $source, $site_name, $url, $admin_email, $language, $domain, $timezone, $mode) { |
282 | - $config = [ |
|
282 | + $config = [ |
|
283 | 283 | 'name' => $site_name, |
284 | 284 | 'url' => [$url], |
285 | 285 | 'admin_email' => $admin_email, |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | php $argv[0] -i |
178 | 178 | php $argv[0] -sn Web-site -i |
179 | 179 | |
180 | -HELP; |
|
180 | +help; |
|
181 | 181 | return; |
182 | 182 | } |
183 | 183 | |
@@ -217,4 +217,4 @@ discard block |
||
217 | 217 | Login: $admin_login |
218 | 218 | Password: $options[admin_password] |
219 | 219 | |
220 | -SUCCESS; |
|
220 | +success; |
@@ -120,7 +120,7 @@ |
||
120 | 120 | if (isset($_POST['site_url'])) { |
121 | 121 | $url = $_POST['site_url']; |
122 | 122 | } else { |
123 | - $https = @$_SERVER['HTTPS'] ? $_SERVER['HTTPS'] !== 'off' : ( |
|
123 | + $https = @$_SERVER['HTTPS'] ? $_SERVER['HTTPS'] !== 'off' : ( |
|
124 | 124 | @$_SERVER['REQUEST_SCHEME'] === 'https' || |
125 | 125 | @$_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' |
126 | 126 | ); |