Updated CodeSniffer files for work with Version 1.3.3

3 files changed, 50 insertions, 81 deletions

diff --git a/_cs/DokuWiki/DokuWikiCodingStandard.php b/_cs/DokuWiki/DokuWikiCodingStandard.php
deleted file mode 100644
index 36133fc46..000000000
--- a/_cs/DokuWiki/DokuWikiCodingStandard.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * DokuWiki Coding Standard.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Andreas Gohr <andi@splitbrain.org>
- */
-
-if (class_exists('PHP_CodeSniffer_Standards_CodingStandard', true) === false) {
-    throw new PHP_CodeSniffer_Exception('Class PHP_CodeSniffer_Standards_CodingStandard not found');
-}
-
-/**
- * DokuWiki Coding Standard.
- *
- * @category  PHP
- * @package   PHP_CodeSniffer
- * @author    Andreas Gohr <andi@splitbrain.org>
- */
-class PHP_CodeSniffer_Standards_DokuWiki_DokuWikiCodingStandard extends PHP_CodeSniffer_Standards_CodingStandard {
-
-
-    /**
-     * Return a list of external sniffs to include with this standard.
-     *
-     * @return array
-     */
-    public function getIncludedSniffs() {
-        return array(
-            'Generic/Sniffs/Classes/DuplicateClassNameSniff.php',
-            'Generic/Sniffs/CodeAnalysis/JumbledIncrementerSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UnnecessaryFinalModifierSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UnconditionalIfStatementSniff.php',
-            'Generic/Sniffs/CodeAnalysis/ForLoopShouldBeWhileLoopSniff.php',
-            'Generic/Sniffs/CodeAnalysis/ForLoopWithTestFunctionCallSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UnusedFunctionParameterSniff.php',
-            'Generic/Sniffs/CodeAnalysis/EmptyStatementSniff.php',
-            'Generic/Sniffs/CodeAnalysis/UselessOverridingMethodSniff.php',
-            'Generic/Sniffs/Commenting/TodoSniff.php',
-            'Generic/Sniffs/Files/LineEndingsSniff.php',
-            'Generic/Sniffs/Formatting/DisallowMultipleStatementsSniff.php',
-            'Generic/Sniffs/Metrics/NestingLevelSniff.php',
-//            'Generic/Sniffs/Metrics/CyclomaticComplexitySniff.php', //FIXME we might need to tune this first
-            'Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php',
-            'Generic/Sniffs/PHP/LowerCaseConstantSniff.php',
-            'Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php',
-            'Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php',
-            'Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php',
-            'DokuWiki/Sniffs/WhiteSpace/ScopeIndentSniff.php',
-            'Zend/Sniffs/Files/ClosingTagSniff.php',
-            'PEAR/Sniffs/Functions/ValidDefaultValueSniff.php',
-            'Squiz/Sniffs/PHP/EvalSniff.php',
-            'Squiz/Sniffs/PHP/NonExecutableCodeSniff.php',
-//            'Squiz/Sniffs/PHP/CommentedOutCodeSniff.php', //FIXME should ignore oneliners
-            'Squiz/Sniffs/WhiteSpace/SuperfluousWhitespaceSniff.php',
-            'Squiz/Sniffs/PHP/NonExecutableCodeSniff.php',
-            'Squiz/Sniffs/CSS/LowercaseStyleDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/MissingColonSniff.php',
-            'Squiz/Sniffs/CSS/DisallowMultipleStyleDefinitionsSniff.php',
-            'Squiz/Sniffs/CSS/ColonSpacingSniff.php',
-            'Squiz/Sniffs/CSS/ClassDefinitionClosingBraceSpaceSniff.php',
-            'Squiz/Sniffs/CSS/SemicolonSpacingSniff.php',
-            'Squiz/Sniffs/CSS/IndentationSniff.php',
-            'Squiz/Sniffs/CSS/EmptyClassDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/ClassDefinitionNameSpacingSniff.php',
-            'Squiz/Sniffs/CSS/EmptyStyleDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/OpacitySniff.php',
-            'Squiz/Sniffs/CSS/ColourDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/DuplicateClassDefinitionSniff.php',
-            'Squiz/Sniffs/CSS/ClassDefinitionOpeningBraceSpaceSniff.php',
-
-            'Squiz/Sniffs/Commenting/DocCommentAlignmentSniff.php',
-
-        );
-    }
-
-}//end class
diff --git a/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php b/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php
index c95e0fd33..9cd9a7d36 100644
--- a/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php
+++ b/_cs/DokuWiki/Sniffs/PHP/DiscouragedFunctionsSniff.php
@@ -49,8 +49,6 @@ class DokuWiki_Sniffs_PHP_DiscouragedFunctionsSniff extends Generic_Sniffs_PHP_F
      *
      * @var bool
      */
-    protected $error = false;
+    public $error = false;
 
 }//end class
-
-?>
diff --git a/_cs/DokuWiki/ruleset.xml b/_cs/DokuWiki/ruleset.xml
new file mode 100644
index 000000000..5efa6bf06
--- /dev/null
+++ b/_cs/DokuWiki/ruleset.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<ruleset name="DokuWiki">
+    <description>DokuWiki Coding Standard</description>
+
+            <rule ref="Generic.Classes.DuplicateClassName" />,
+            <rule ref="Generic.CodeAnalysis.JumbledIncrementer" />,
+            <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier" />,
+            <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement" />,
+            <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" />,
+            <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall" />,
+            <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter" />,
+            <rule ref="Generic.CodeAnalysis.EmptyStatement" />,
+            <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" />,
+            <rule ref="Generic.Commenting.Todo" />,
+            <rule ref="Generic.Files.LineEndings" />,
+            <rule ref="Generic.Formatting.DisallowMultipleStatements" />,
+            <rule ref="Generic.Metrics.NestingLevel" />,
+<!--            <rule ref="Generic./Metrics/CyclomaticComplexity" />, //FIXME we might need to tune this first -->
+            <rule ref="Generic.NamingConventions.UpperCaseConstantName" />,
+            <rule ref="Generic.PHP.LowerCaseConstant" />,
+            <rule ref="Generic.PHP.DisallowShortOpenTag" />,
+            <rule ref="Generic.PHP.ForbiddenFunctions" />,
+            <rule ref="Generic.WhiteSpace.DisallowTabIndent" />,
+            <rule ref="DokuWiki.WhiteSpace.ScopeIndent" />,
+            <rule ref="Zend.Files.ClosingTag" />,
+            <rule ref="PEAR.Functions.ValidDefaultValue" />,
+            <rule ref="Squiz.PHP.Eval" />,
+            <rule ref="Squiz.PHP.NonExecutableCode" />,
+<!--            <rule ref="Squiz./PHP/CommentedOutCode" />, //FIXME should ignore oneliners -->
+            <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace" />,
+            <rule ref="Squiz.PHP.NonExecutableCode" />,
+            <rule ref="Squiz.CSS.LowercaseStyleDefinition" />,
+            <rule ref="Squiz.CSS.MissingColon" />,
+            <rule ref="Squiz.CSS.DisallowMultipleStyleDefinitions" />,
+            <rule ref="Squiz.CSS.ColonSpacing" />,
+            <rule ref="Squiz.CSS.ClassDefinitionClosingBraceSpace" />,
+            <rule ref="Squiz.CSS.SemicolonSpacing" />,
+            <rule ref="Squiz.CSS.Indentation" />,
+            <rule ref="Squiz.CSS.EmptyClassDefinition" />,
+            <rule ref="Squiz.CSS.ClassDefinitionNameSpacing" />,
+            <rule ref="Squiz.CSS.EmptyStyleDefinition" />,
+            <rule ref="Squiz.CSS.Opacity" />,
+            <rule ref="Squiz.CSS.ColourDefinition" />,
+            <rule ref="Squiz.CSS.DuplicateClassDefinition" />,
+            <rule ref="Squiz.CSS.ClassDefinitionOpeningBraceSpace" />,
+
+            <rule ref="Squiz.Commenting.DocCommentAlignment" />,
+
+</ruleset>