Merge remote-tracking branch 'upstream/develop' into develop

Author: Progi1984

phpmd.xml.dist

@@ -4,11 +4,24 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
     xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
-    <rule ref="rulesets/naming.xml"/>
+    <rule ref="rulesets/naming.xml">
+        <exclude name="LongVariable" />
+    </rule>
+    <rule ref="rulesets/naming.xml/LongVariable">
+        <properties>
+            <property name="maximum" value="32" />
+        </properties>
+    </rule>
     <rule ref="rulesets/design.xml/ExitExpression" />
     <rule ref="rulesets/design.xml/EvalExpression" />
     <rule ref="rulesets/design.xml/GotoStatement" />
     <rule ref="rulesets/design.xml/DepthOfInheritance" />
+    <rule ref="rulesets/design.xml/CouplingBetweenObjects">
+        <!-- PptSlides needs more coupling (default: 13) -->
+        <properties>
+            <property name="minimum" value="30" />
+        </properties>
+    </rule>
     <rule ref="rulesets/design.xml/NumberOfChildren">
         <!-- AbstractStyle needs more children (default: 15) -->
         <properties>