Merge pull request #53 from laminas/2.1.x-merge-up-into-2.2.x

Merge release 2.1.3 into 2.2.x
laminas · Oct 25, 2020 · 47f592b · 47f592b
2 parents 9e0cdcb + 83b85a4
commit 47f592b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,25 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.1.3 - 2020-10-25
+
+
+-----
+
+### Release Notes for [2.1.3](https://github.com/laminas/laminas-coding-standard/milestone/8)
+
+2.1.x bugfix release (patch)
+
+### 2.1.3
+
+- Total issues resolved: **0**
+- Total pull requests resolved: **1**
+- Total contributors: **1**
+
+#### Bug
+
+ - [52: Remove double referenced rule](https://github.com/laminas/laminas-coding-standard/pull/52) thanks to @geerteltink
+
 ## 2.1.2 - 2020-10-25
 
 

diff --git a/src/LaminasCodingStandard/ruleset.xml b/src/LaminasCodingStandard/ruleset.xml
@@ -797,6 +797,7 @@
         <exclude name="Squiz.Commenting.FunctionComment.TypeHintMissing"/>
         <!-- May use excessive whitespace to align comments after parameter names -->
         <exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamName"/>
+        <!-- Adds space between intersection types -->
         <exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamType"/>
     </rule>
 
@@ -808,7 +809,6 @@
         </properties>
     </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing"/>
-    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint"/>
     <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
         <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint"/>
         <exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification"/>