update phpmd/phpcs xml

ray-di · Jul 22, 2017 · 1d8a31e · 1d8a31e
1 parent a4d53e9
commit 1d8a31e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/phpcs.xml b/phpcs.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<ruleset name="BEAR">
-    <description>The BEAR coding standard.</description>
+<ruleset>
     <!-- 2. General -->
     <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
     <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>
@@ -15,5 +14,6 @@
         <exclude name="PEAR.Commenting.FunctionComment.SpacingBeforeTags"/>
         <exclude name="PEAR.Commenting.FunctionComment.MissingParamTag"/>
         <exclude name="PEAR.Commenting.FunctionComment.Missing"/>
+        <exclude name="PEAR.Commenting.FunctionComment.ParameterCommentsNotAligned"/>
     </rule>
 </ruleset>
diff --git a/phpmd.xml b/phpmd.xml
@@ -1,9 +1,7 @@
-<ruleset name="PHP.Skeleton rules"
-         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+<ruleset xmlns="http://pmd.sf.net/ruleset/1.0.0"
          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">
-    <description>PHP.Skeleton rule set</description>
     <!--codesize-->
     <rule ref="rulesets/codesize.xml/CyclomaticComplexity" />
     <rule ref="rulesets/codesize.xml/NPathComplexity" />
@@ -20,11 +18,7 @@
     <rule ref="rulesets/design.xml/GotoStatement" />
     <rule ref="rulesets/design.xml/NumberOfChildren" />
     <rule ref="rulesets/design.xml/DepthOfInheritance" />
-    <rule ref="rulesets/design.xml/CouplingBetweenObjects" >
-        <properties>
-            <property name="minimum" value="20"/>
-        </properties>
-    </rule>
+    <rule ref="rulesets/design.xml/CouplingBetweenObjects" />
     <!--naming-->
     <rule ref="rulesets/naming.xml/ConstantNamingConventions" />
     <rule ref="rulesets/naming.xml/BooleanGetMethodName" />
@@ -37,7 +31,7 @@
     <rule ref="rulesets/controversial.xml/Superglobals" />
     <rule ref="rulesets/controversial.xml/CamelCaseClassName" />
     <rule ref="rulesets/controversial.xml/CamelCasePropertyName" />
-    <!--<rule ref="rulesets/controversial.xml/CamelCaseMethodName" />-->
+    <rule ref="rulesets/controversial.xml/CamelCaseMethodName" />
     <rule ref="rulesets/controversial.xml/CamelCaseParameterName" />
     <rule ref="rulesets/controversial.xml/CamelCaseVariableName" />
     <!--cleancode-->