diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-15 21:52:25 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-06-16 22:35:44 +0200 |
| commit | a94581e7cae2e7fac6f88b8718866f694e8b01f0 (patch) | |
| tree | d6b9bd0519f65d087e35f4d4c89681086d63ec17 | |
| parent | 99a2f2fdb4d3f617f09ca248bf526b7ec97ba7aa (diff) | |
| download | forums-a94581e7cae2e7fac6f88b8718866f694e8b01f0.tar forums-a94581e7cae2e7fac6f88b8718866f694e8b01f0.tar.gz forums-a94581e7cae2e7fac6f88b8718866f694e8b01f0.tar.bz2 forums-a94581e7cae2e7fac6f88b8718866f694e8b01f0.tar.xz forums-a94581e7cae2e7fac6f88b8718866f694e8b01f0.zip | |
[ticket/12721] Add Squiz.ControlStructures.ForLoopDeclaration in legacy
PHPBB3-12721
| -rw-r--r-- | build/code_sniffer/ruleset-php-legacy.xml | 3 | ||||
| -rw-r--r-- | phpBB/includes/functions_convert.php | 2 | ||||
| -rw-r--r-- | phpBB/search.php | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/build/code_sniffer/ruleset-php-legacy.xml b/build/code_sniffer/ruleset-php-legacy.xml index f060e8e14f..3a1d849135 100644 --- a/build/code_sniffer/ruleset-php-legacy.xml +++ b/build/code_sniffer/ruleset-php-legacy.xml @@ -51,6 +51,9 @@ <!-- There should be a space between each element of a foreach loop and the as keyword should be lowercase. --> <rule ref="Squiz.ControlStructures.ForEachLoopDeclaration" /> + <!-- In a for loop declaration, there should be no space inside the brackets and there should be 0 spaces before and 1 space after semicolons. --> + <rule ref="Squiz.ControlStructures.ForLoopDeclaration" /> + <!-- In the argument list, there MUST NOT be a space before each comma, and there MUST be one space after each comma. --> <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing"> diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index e8f8151d6f..9005c57c8a 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -2297,7 +2297,7 @@ function convert_bbcode($message, $convert_size = true, $extended_bbcodes = fals $message = preg_replace('#\[size=([0-9]+)\](.*?)\[/size\]#i', '[size=\1]\2[/size]', $message); $message = preg_replace('#\[size=[0-9]{2,}\](.*?)\[/size\]#i', '[size=29]\1[/size]', $message); - for ($i = sizeof($size); $i; ) + for ($i = sizeof($size); $i;) { $i--; $message = str_replace('[size=' . $i . ']', '[size=' . $size[$i] . ']', $message); diff --git a/phpBB/search.php b/phpBB/search.php index 91ea21909d..f1f02ac766 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1256,7 +1256,7 @@ $s_characters .= '<option value="0">0</option>'; $s_characters .= '<option value="25">25</option>'; $s_characters .= '<option value="50">50</option>'; -for ($i = 100; $i <= 1000 ; $i += 100) +for ($i = 100; $i <= 1000; $i += 100) { $selected = ($i == 300) ? ' selected="selected"' : ''; $s_characters .= '<option value="' . $i . '"' . $selected . '>' . $i . '</option>'; |