Merge pull request #49 from geerteltink/fix/intersect-types

Handle intersection types correctly
laminas · Oct 25, 2020 · 8d5ba64 · 8d5ba64
2 parents e636343 + e46b353
commit 8d5ba64
Show file tree

Hide file tree

Showing 4 changed files with 125 additions and 6 deletions.
diff --git a/src/LaminasCodingStandard/ruleset.xml b/src/LaminasCodingStandard/ruleset.xml
@@ -797,17 +797,23 @@
         <exclude name="Squiz.Commenting.FunctionComment.TypeHintMissing"/>
         <!-- May use excessive whitespace to align comments after parameter names -->
         <exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamName"/>
+        <exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamType"/>
     </rule>
 
     <!-- DocBlocks and comments SHOULD NOT be used for already typehinted arguments,
          except arrays. -->
-    <rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint"/>
     <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
         <properties>
             <property name="enableNativeTypeHint" value="false"/>
         </properties>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint"/>
+    <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"/>
+    </rule>
+    <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing"/>
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
         <exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint"/>
     </rule>

diff --git a/test/expected-report.txt b/test/expected-report.txt
@@ -15,7 +15,7 @@ test/fixable/4.1.ExtendsAndImplements.php             6       0
 test/fixable/4.2.UsingTraits.php                      5       0
 test/fixable/4.3.PropertiesAndConstants.php           7       0
 test/fixable/4.4.MethodsAndFunctions.php              26      0
-test/fixable/4.5.MethodAndFunctionArguments.php       66      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
@@ -33,11 +33,11 @@ test/fixable/6.Operators.php                          97      0
 test/fixable/7.Closures.php                           2       0
 test/fixable/8.AnonymousClasses.php                   1       0
 test/fixable/9.CommentingAndDocBlocks.php             17      0
-test/fixable/9.GenericTypeHintSyntax.php              4       0
+test/fixable/9.GenericTypeHintSyntax.php              5       0
 ----------------------------------------------------------------------
-A TOTAL OF 566 ERRORS AND 2 WARNINGS WERE FOUND IN 31 FILES
+A TOTAL OF 569 ERRORS AND 2 WARNINGS WERE FOUND IN 31 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 483 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 486 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 
diff --git a/test/fixable/9.GenericTypeHintSyntax.php b/test/fixable/9.GenericTypeHintSyntax.php
@@ -8,7 +8,9 @@
 
 declare(strict_types=1);
 
+use Generic;
 use IteratorAggregate;
+use Traversable;
 
 class GenericTypeHintSyntax
 {
@@ -33,4 +35,60 @@ public function doSomethingWithArray(array $config): void
     {
         $this->config = $config;
     }
+
+    /**
+     * @param Generic<array> $a
+     */
+    public function genericWithoutItemsSpecification(Generic $a)
+    {
+    }
+
+    /**
+     * @param array[]&Traversable $a
+     */
+    public function traversableIntersection(Traversable $a)
+    {
+    }
+
+    /**
+     * @param Traversable&array[] $a
+     */
+    public function traversableIntersectionDifferentOrder(Traversable $a)
+    {
+    }
+
+    /**
+     * @param null|Traversable $a
+     */
+    public function traversableNull(?Traversable $a)
+    {
+    }
+
+    /**
+     * @param array<string>|array<int> $a
+     */
+    public function unionWithSameBase(array $a)
+    {
+    }
+
+    /**
+     * @param array<string>|array<int>|array<bool> $a
+     */
+    public function unionWithSameBaseAndMoreTypes(array $a)
+    {
+    }
+
+    /**
+     * @param array<int>|bool[] $a
+     */
+    public function unionWithSameBaseToo(array $a)
+    {
+    }
+
+    /**
+     * @param array<string>|array<int>|array<bool>|null $a
+     */
+    public function unionWithSameNullableBase(?array $a)
+    {
+    }
 }
diff --git a/test/fixed/9.GenericTypeHintSyntax.php b/test/fixed/9.GenericTypeHintSyntax.php
@@ -8,7 +8,9 @@
 
 declare(strict_types=1);
 
+use Generic;
 use IteratorAggregate;
+use Traversable;
 
 class GenericTypeHintSyntax
 {
@@ -33,4 +35,57 @@ public function doSomethingWithArray(array $config): void
     {
         $this->config = $config;
     }
+
+    /**
+     * @param Generic<array> $a
+     */
+    public function genericWithoutItemsSpecification(Generic $a)
+    {
+    }
+
+    /**
+     * @param array[]&Traversable $a
+     */
+    public function traversableIntersection(Traversable $a)
+    {
+    }
+
+    /**
+     * @param Traversable&array[] $a
+     */
+    public function traversableIntersectionDifferentOrder(Traversable $a)
+    {
+    }
+
+    public function traversableNull(?Traversable $a)
+    {
+    }
+
+    /**
+     * @param array<string>|array<int> $a
+     */
+    public function unionWithSameBase(array $a)
+    {
+    }
+
+    /**
+     * @param array<string>|array<int>|array<bool> $a
+     */
+    public function unionWithSameBaseAndMoreTypes(array $a)
+    {
+    }
+
+    /**
+     * @param array<int>|bool[] $a
+     */
+    public function unionWithSameBaseToo(array $a)
+    {
+    }
+
+    /**
+     * @param array<string>|array<int>|array<bool>|null $a
+     */
+    public function unionWithSameNullableBase(?array $a)
+    {
+    }
 }