From fea2cdbaf143503d1ee43819d072a7279d44a649 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 3 Jan 2012 08:53:56 +0100
Subject: [PATCH 1/3] Fix: try another method

---
 build.xml                           |   2 +-
 dev/codesniffer/jenkins_ruleset.xml | 219 ++++++++++++++++++++++++++++
 2 files changed, 220 insertions(+), 1 deletion(-)
 create mode 100755 dev/codesniffer/jenkins_ruleset.xml

diff --git a/build.xml b/build.xml
index 18dc95c341e..5cdcaf708db 100644
--- a/build.xml
+++ b/build.xml
@@ -66,7 +66,7 @@
  <!-- Generate checkstyle.xml -->
  <target name="phpcs">
   <exec executable="phpcs" dir="${basedir}" output="${basedir}/hudson/logs/checkstyle.xml">
-    <arg line=" --standard=${basedir}/dev/codesniffer/ruleset.xml
+    <arg line=" --standard=${basedir}/dev/codesniffer/jenkins_ruleset.xml
     			--report=checkstyle
                 --ignore=${ignorepaths},${ignoreregexp}
                 htdocs
diff --git a/dev/codesniffer/jenkins_ruleset.xml b/dev/codesniffer/jenkins_ruleset.xml
new file mode 100755
index 00000000000..42ade4a8c51
--- /dev/null
+++ b/dev/codesniffer/jenkins_ruleset.xml
@@ -0,0 +1,219 @@
+<?xml version="1.0"?>
+<!DOCTYPE ruleset SYSTEM "ruleset.dtd">
+<ruleset name="Dolibarr">
+	<description>Dolibarr coding standard.</description>
+
+	<!-- List of all tests -->
+
+    <rule ref="Generic.CodeAnalysis.EmptyStatement" />
+ 
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.NotAllowedWarning">
+		<severity>0</severity>
+	</rule>
+
+    <!-- <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop" /> -->
+
+    <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall" />
+
+    <rule ref="Generic.CodeAnalysis.JumbledIncrementer" />
+
+    <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement" />
+
+    <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier" />
+
+    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter" />
+    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter.Found">
+		<severity>0</severity>
+    </rule>
+
+    <rule ref="Generic.CodeAnalysis.UselessOverridingMethod" />
+
+    <rule ref="Generic.Commenting.Todo" />
+
+	<!-- Warning if action on same line than if -->
+	<!--
+		<rule ref="Generic.ControlStructures.InlineControlStructure">
+		<properties> <property name="error" value="false"/> </properties>
+		</rule>
+	-->
+
+	<!-- Lines can be 85 chars long, but never show errors -->
+	<rule ref="Generic.Files.LineLength">
+		<properties>
+			<property name="lineLimit" value="1000" />
+			<property name="absoluteLineLimit" value="0" />
+		</properties>
+	</rule>
+
+	<!-- Use Unix newlines -->
+	<rule ref="Generic.Files.LineEndings">
+		<properties>
+			<property name="eolChar" value="\n" />
+		</properties>
+	</rule>
+
+    <!-- To disallow several statements on same line -->
+	<!-- <rule ref="Generic.Formatting.DisallowMultipleStatements" /> -->
+
+	<!-- Have 2 chars padding maximum and always show as errors -->
+	<!--
+		<rule ref="Generic.Formatting.MultipleStatementAlignment">
+		<properties> <property name="maxPadding" value="2"/> <property
+		name="ignoreMultiLine" value="true"/> </properties> </rule>
+	-->
+
+	<rule ref="Generic.Formatting.SpaceAfterCast" />
+
+    <rule ref="Generic.Functions.CallTimePassByReference" />
+
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing" />
+	<rule ref="Generic.Functions.FunctionCallArgumentSpacing.NoSpaceAfterComma">
+		<severity>0</severity>
+	</rule>
+	<rule
+		ref="Generic.Functions.FunctionCallArgumentSpacing.TooMuchSpaceAfterComma">
+		<severity>0</severity>
+	</rule>
+
+    <!-- Tweaks to metrics -->
+    <rule ref="Generic.Metrics.CyclomaticComplexity">
+        <properties>
+            <property name="complexity" value="25" />
+            <property name="absoluteComplexity" value="100" />
+        </properties>
+    </rule>
+    <rule ref="Generic.Metrics.NestingLevel">
+        <properties>
+            <property name="nestingLevel" value="6" />
+            <property name="absoluteNestingLevel" value="50" />
+        </properties>
+    </rule>
+
+	<rule ref="Generic.NamingConventions.ConstructorName" />
+	<!-- Check if we use PHP4 constructor instead of __construct() -->
+	<rule ref="Generic.NamingConventions.ConstructorName.OldStyle">
+        <severity>0</severity>
+	</rule>
+
+	<rule ref="Generic.NamingConventions.UpperCaseConstantName" />
+
+    <rule ref="Generic.PHP.DeprecatedFunctions" />
+
+	<rule ref="Generic.PHP.DisallowShortOpenTag" />
+
+    <rule ref="Generic.PHP.ForbiddenFunctions" />
+
+    <!-- Warning when using @ before functions -->
+    <!-- <rule ref="Generic.PHP.NoSilencedErrors" /> -->
+
+	<!-- Say if null, true, false must be uppercase -->
+	<!-- <rule ref="Generic.PHP.UpperCaseConstant" /> -->
+
+	<rule ref="Generic.Strings.UnnecessaryStringConcat" />
+
+    <rule ref="Generic.VersionControl.SubversionProperties" />
+
+	<!-- Disallow usage of tab -->
+	<!--  <rule ref="Generic.WhiteSpace.DisallowTabIndent" /> -->
+
+	<!-- Check indent are done with spaces and wiht correct number -->
+	<!-- Disabled as this does not support tab -->
+	<!-- <rule ref="Generic.WhiteSpace.ScopeIndent" /> -->
+
+	<rule ref="PEAR.Classes.ClassDeclaration" />
+
+    <!-- Check for duplicate class names -->
+    <!-- <rule ref="Generic.Classes.DuplicateClassName" /> -->
+
+    <rule ref="PEAR.Commenting.ClassComment" />
+    <rule ref="PEAR.Commenting.ClassComment.MissingTag">
+        <severity>0</severity>
+    </rule>
+    
+    <!-- 
+    <rule ref="PEAR.Commenting.FileComment" />
+    <rule ref="PEAR.Commenting.FileComment.WrongStyle">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FileComment.MissingVersion">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FileComment.MissingTag">
+        <severity>0</severity>
+    </rule>
+    -->
+    <rule ref="PEAR.Commenting.FunctionComment.WrongStyle">
+        <severity>0</severity>
+    </rule>
+    
+    <rule ref="PEAR.Commenting.FunctionComment.Empty">
+        <severity>5</severity>
+    </rule>
+    
+    <rule ref="PEAR.Commenting.FunctionComment" />
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingBeforeParamType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterLongType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterLongName">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParams">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ParameterCommentsNotAligned">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ParameterNamesNotAligned">
+        <severity>0</severity>
+    </rule>
+
+    <rule ref="PEAR.Commenting.InlineComment" />
+
+	<!-- <rule ref="PEAR.ControlStructures.ControlSignature" /> -->
+
+	<!-- <rule ref="PEAR.ControlStructures.MultiLineCondition" /> -->
+
+	<!-- Test if () are removed for includes -->
+	<!-- <rule ref="PEAR.Files.IncludingFile"/> -->
+
+	<rule ref="PEAR.Formatting.MultiLineAssignment" />
+
+	<rule ref="PEAR.Functions.FunctionCallSignature" />
+
+	<rule ref="PEAR.Functions.ValidDefaultValue" />
+
+	<rule ref="PEAR.NamingConventions.ValidClassName" />
+	<rule ref="PEAR.NamingConventions.ValidClassName.StartWithCaptial">
+        <severity>0</severity>
+	</rule>
+
+	<rule ref="PEAR.NamingConventions.ValidFunctionName" />
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.FunctionNoCaptial">
+        <severity>0</severity>
+	</rule>
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.NotCamelCaps">
+        <severity>0</severity>
+	</rule>
+	<rule ref="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore">
+        <severity>0</severity>
+	</rule>
+
+	<rule ref="PEAR.NamingConventions.ValidVariableName" />
+
+	<rule ref="PEAR.WhiteSpace.ObjectOperatorIndent" />
+
+	<rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
+        <severity>0</severity>
+    </rule>
+	
+    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace.Line">
+        <severity>0</severity>
+    </rule>
+    
+    <!-- Already found as a Generic rule -->
+	<!-- <rule ref="PEAR.WhiteSpace.ScopeIndent" /> -->
+
+</ruleset>

From 01a9386eb81dae5b12bf6055e757fbc5a272e152 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 3 Jan 2012 09:10:36 +0100
Subject: [PATCH 2/3] Fix: try to use another method

---
 dev/codesniffer/jenkins_ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/codesniffer/jenkins_ruleset.xml b/dev/codesniffer/jenkins_ruleset.xml
index 42ade4a8c51..dfc72ff101b 100755
--- a/dev/codesniffer/jenkins_ruleset.xml
+++ b/dev/codesniffer/jenkins_ruleset.xml
@@ -209,7 +209,7 @@
         <severity>0</severity>
     </rule>
 	
-    <rule ref="Squiz.WhiteSpace.ScopeClosingBrace.Line">
+    <rule ref="PEAR.WhiteSpace.ScopeClosingBrace.Line">
         <severity>0</severity>
     </rule>
     

From 10314e500c3a831dad670a1aef24671840f70657 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 3 Jan 2012 09:22:08 +0100
Subject: [PATCH 3/3] Fix: regression

---
 dev/codesniffer/jenkins_ruleset.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/codesniffer/jenkins_ruleset.xml b/dev/codesniffer/jenkins_ruleset.xml
index dfc72ff101b..e4e7962ab47 100755
--- a/dev/codesniffer/jenkins_ruleset.xml
+++ b/dev/codesniffer/jenkins_ruleset.xml
@@ -205,7 +205,7 @@
 
 	<rule ref="PEAR.WhiteSpace.ObjectOperatorIndent" />
 
-	<rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
+	<rule ref="PEAR.WhiteSpace.ScopeClosingBrace">
         <severity>0</severity>
     </rule>