Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts: dev/codesniffer/ruleset.xml
Dolibarr · Dec 19, 2014 · 0bb431c · 0bb431c
2 parents 3debf56 + 47cab90
commit 0bb431c
Showing 1 changed file with 41 additions and 3 deletions.
diff --git a/dev/codesniffer/ruleset.xml b/dev/codesniffer/ruleset.xml
@@ -6,17 +6,21 @@
 	<exclude-pattern>*/conf.php</exclude-pattern>
 	<exclude-pattern>*/includes/*</exclude-pattern>
 	<exclude-pattern>*/documents/*</exclude-pattern>
+	<exclude-pattern>*/dev/vagrant/*</exclude-pattern>
 	<exclude-pattern>*/custom/*</exclude-pattern>
 	<exclude-pattern>*/nltechno*</exclude-pattern>
-		
-	<!-- List of all tests -->
+
+		<!-- List of all tests -->
 
 	<rule ref="Internal.NoCodeFound">
 		<severity>0</severity>
 	</rule>
 
 	<rule ref="Generic.CodeAnalysis.EmptyStatement" />
-
+
+	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedCATCH">
+		<severity>0</severity>
+	</rule>
 	<rule ref="Generic.CodeAnalysis.EmptyStatement.DetectedIF">
 		<severity>0</severity>
 	</rule>
@@ -203,6 +207,40 @@
     <rule ref="PEAR.Commenting.FunctionComment.Missing">
         <severity>0</severity>
     </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@authorTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@categoryTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@licenseTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@linkTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.ClassComment.Missing@packageTag">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamType">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.SpacingAfterParamName">
+        <severity>0</severity>
+    </rule>
+    <!-- TODO Remove this and fix reported errors -->
+    <rule ref="PEAR.Commenting.ClassComment.Missing">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.MissingReturn">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.ReturnNotRequired">
+        <severity>0</severity>
+    </rule>
+    <rule ref="PEAR.Commenting.FunctionComment.Missing">
+        <severity>0</severity>
+    </rule>
 
     <!-- 
     <rule ref="PEAR.Commenting.FileComment" />