Enforce explicit assertions for advanced string types and int ranges

Author: jonnyeom

src/Unleashed/ruleset.xml

@@ -497,7 +497,12 @@
     <!-- Forbid useless semicolon `;` -->
     <rule ref="SlevomatCodingStandard.PHP.UselessSemicolon"/>
     <!-- Require /* @var type $foo */ and similar simple inline annotations to be replaced by assert() -->
-    <rule ref="SlevomatCodingStandard.PHP.RequireExplicitAssertion"/>
+    <rule ref="SlevomatCodingStandard.PHP.RequireExplicitAssertion">
+        <properties>
+            <property name="enableAdvancedStringTypes" value="true"/>
+            <property name="enableIntegerRanges" value="true"/>
+        </properties>
+    </rule>
     <!-- Require use of short versions of scalar types (i.e. int instead of integer) -->
     <rule ref="SlevomatCodingStandard.TypeHints.LongTypeHints"/>
     <!-- Require the `null` type hint to be in the last position of annotations -->

tests/expected_report.txt

@@ -25,7 +25,7 @@ tests/input/ForbiddenClasses.php                      7       0
 tests/input/fully-qualified-and-fallbacks.php         2       0
 tests/input/fully-qualified-without-namespace.php     4       0
 tests/input/inheritdoc.php                            12      1
-tests/input/inline_type_hint_assertions.php           7       0
+tests/input/inline_type_hint_assertions.php           10      0
 tests/input/LowCaseTypes.php                          3       0
 tests/input/merge-conflict.php                        6       0
 tests/input/namespaces-spacing.php                    13      0
@@ -55,9 +55,9 @@ tests/input/use-ordering.php                          9       0
 tests/input/useless-semicolon.php                     2       0
 tests/input/UselessConditions.php                     24      0
 ----------------------------------------------------------------------
-A TOTAL OF 518 ERRORS AND 9 WARNINGS WERE FOUND IN 51 FILES
+A TOTAL OF 521 ERRORS AND 9 WARNINGS WERE FOUND IN 51 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 415 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 418 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 

tests/fixed/inline_type_hint_assertions.php

@@ -24,3 +24,12 @@
 assert(is_int($multipleScalarTypes) || is_float($multipleScalarTypes) || is_bool($multipleScalarTypes) || is_string($multipleScalarTypes) || is_array($multipleScalarTypes) || $multipleScalarTypes === null);
 
 /** @var Potato $variableThatIsNowhereToBeFound */
+
+$a = 1;
+assert(is_int($a) && $a > 0);
+
+$aa = null;
+assert((is_int($aa) && $aa > 0) || $aa === null);
+
+$aaa = 'string';
+assert(is_string($aaa) && $aaa !== '');

tests/input/inline_type_hint_assertions.php

@@ -24,3 +24,12 @@
 $multipleScalarTypes = expression();
 
 /** @var Potato $variableThatIsNowhereToBeFound */
+
+/** @var positive-int $a */
+$a = 1;
+
+/** @var positive-int|null $aa */
+$aa = null;
+
+/** @var non-empty-string $aaa */
+$aaa = 'string';