From a9aaffccc372b664f50c0595cf0ec6c943c239f4 Mon Sep 17 00:00:00 2001
From: Laminas Bot <laminas-bot@mwop.net>
Date: Sun, 25 Oct 2020 12:51:47 +0000
Subject: [PATCH 1/3] Bumps changelog version to 2.1.4

Updates the CHANGELOG.md file to add a changelog entry for a new 2.1.4 version.
---
 CHANGELOG.md | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9df5a0..b7f0b8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 2.1.4 - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 2.1.3 - 2020-10-25
 
 

From b3aacb8d41d422ea31e3be54922daf5210b8d297 Mon Sep 17 00:00:00 2001
From: Geert Eltink <geert.eltink@gmail.com>
Date: Mon, 26 Oct 2020 08:22:31 +0100
Subject: [PATCH 2/3] fix: loosen typehint rules

Signed-off-by: Geert Eltink <geert.eltink@gmail.com>
---
 src/LaminasCodingStandard/ruleset.xml | 5 ++++-
 test/expected-report.txt              | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/LaminasCodingStandard/ruleset.xml b/src/LaminasCodingStandard/ruleset.xml
index d4411e5..e5e83e1 100644
--- a/src/LaminasCodingStandard/ruleset.xml
+++ b/src/LaminasCodingStandard/ruleset.xml
@@ -803,10 +803,13 @@
 
     <!-- DocBlocks and comments SHOULD NOT be used for already typehinted arguments,
          except arrays. -->
+    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHintSpacing"/>
     <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
         <properties>
             <property name="enableNativeTypeHint" value="false"/>
         </properties>
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
     </rule>
     <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHintSpacing"/>
     <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
@@ -816,8 +819,8 @@
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing"/>
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
         <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification"/>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.UselessConstantTypeHint"/>
 
     <!-- The asterisks in a DocBlock should align, and there should be one
          space between the asterisk and tag. -->
diff --git a/test/expected-report.txt b/test/expected-report.txt
index 9e633ce..15eb25a 100644
--- a/test/expected-report.txt
+++ b/test/expected-report.txt
@@ -3,7 +3,7 @@ PHP CODE SNIFFER REPORT SUMMARY
 ----------------------------------------------------------------------
 FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
-test/fixable/2.1.BasicCodingStandard.php              48      1
+test/fixable/2.1.BasicCodingStandard.php              47      1
 test/fixable/2.2.Files.php                            6       0
 test/fixable/2.3.Lines.php                            35      0
 test/fixable/2.4.IndentingAndSpacing.php              46      0
@@ -18,7 +18,7 @@ test/fixable/4.4.MethodsAndFunctions.php              26      0
 test/fixable/4.5.MethodAndFunctionArguments.php       68      0
 test/fixable/4.6.AbstractFinalAndStatic.php           5       0
 test/fixable/4.7.MethodAndFunctionCalls.php           11      0
-test/fixable/4.ClassesPropertiesAndMethods.php        34      0
+test/fixable/4.ClassesPropertiesAndMethods.php        33      0
 test/fixable/5.1.IfElseifElse.php                     13      1
 test/fixable/5.2.SwitchCase.php                       11      0
 test/fixable/5.3.WhileAndDoWhile.php                  12      0
@@ -35,7 +35,7 @@ test/fixable/8.AnonymousClasses.php                   1       0
 test/fixable/9.CommentingAndDocBlocks.php             17      0
 test/fixable/9.GenericTypeHintSyntax.php              5       0
 ----------------------------------------------------------------------
-A TOTAL OF 569 ERRORS AND 2 WARNINGS WERE FOUND IN 31 FILES
+A TOTAL OF 567 ERRORS AND 2 WARNINGS WERE FOUND IN 31 FILES
 ----------------------------------------------------------------------
 PHPCBF CAN FIX 486 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------

From d75f1acf615232e108da2d2cf5a7df3e527b8f38 Mon Sep 17 00:00:00 2001
From: Laminas Bot <laminas-bot@mwop.net>
Date: Mon, 26 Oct 2020 07:33:05 +0000
Subject: [PATCH 3/3] 2.1.4 readiness

Updates the CHANGELOG.md to set the release date.
---
 CHANGELOG.md | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7f0b8c..fc57047 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,27 +2,24 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.1.4 - TBD
+## 2.1.4 - 2020-10-26
 
-### Added
-
-- Nothing.
-
-### Changed
 
-- Nothing.
+-----
 
-### Deprecated
+### Release Notes for [2.1.4](https://github.com/laminas/laminas-coding-standard/milestone/9)
 
-- Nothing.
+2.1.x bugfix release (patch)
 
-### Removed
+### 2.1.4
 
-- Nothing.
+- Total issues resolved: **0**
+- Total pull requests resolved: **1**
+- Total contributors: **1**
 
-### Fixed
+#### Bug
 
-- Nothing.
+ - [54: fix: loosen typehint rules](https://github.com/laminas/laminas-coding-standard/pull/54) thanks to @geerteltink
 
 ## 2.1.3 - 2020-10-25