Merge pull request #427 from cakephp/fix-void-null-type-order-conflict

Fix conflict between TypeHintSniff and Slevomat null position sniffs

Author: dereuromark

CakePHP/Tests/Commenting/TypeHintUnitTest.1.inc

@@ -45,3 +45,12 @@ function test()
 function intersection($param)
 {
 }
+
+/**
+ * Void must be last, after null.
+ *
+ * @return int|void|null
+ */
+function voidAfterNull()
+{
+}

CakePHP/Tests/Commenting/TypeHintUnitTest.1.inc.fixed

@@ -45,3 +45,12 @@ function test()
 function intersection($param)
 {
 }
+
+/**
+ * Void must be last, after null.
+ *
+ * @return int|null|void
+ */
+function voidAfterNull()
+{
+}

CakePHP/Tests/Commenting/TypeHintUnitTest.php

@@ -32,6 +32,7 @@ public function getWarningList($testFile = '')
                     27 => 1,
                     37 => 1,
                     42 => 1,
+                    52 => 1,
                 ];
 
             default:

CakePHP/ruleset.xml

@@ -233,7 +233,6 @@
             <property name="withSpacesAroundOperators" value="no"/>
             <property name="withSpacesInsideParentheses" value="no"/>
             <property name="shortNullable" value="yes"/>
-            <property name="nullPosition" value="last"/>
         </properties>
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
@@ -258,7 +257,6 @@
     <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullCoalesceEqualOperator"/>
     <rule ref="SlevomatCodingStandard.ControlStructures.RequireNullSafeObjectOperator"/>
     <rule ref="SlevomatCodingStandard.Classes.RequireSelfReference"/>
-    <rule ref="SlevomatCodingStandard.TypeHints.NullTypeHintOnLastPosition"/>
 
     <!-- phpcs Zend sniffs -->
     <rule ref="Zend.NamingConventions.ValidVariableName">