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] 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
 ----------------------------------------------------------------------