add fixture to cover float and bool types

Author: TomasVotruba

config/set/assert.php

@@ -6,7 +6,5 @@
 use Rector\Config\RectorConfig;
 
 return static function (RectorConfig $rectorConfig): void {
-    $rectorConfig->rules([
-        AddAssertArrayFromClassMethodDocblockRector::class,
-    ]);
+    $rectorConfig->rules([AddAssertArrayFromClassMethodDocblockRector::class]);
 };

rules-tests/Assert/Rector/ClassMethod/AddAssertArrayFromClassMethodDocblockRector/Fixture/float_int_bool.php.inc

@@ -0,0 +1,38 @@
+<?php
+
+namespace Rector\Tests\Assert\Rector\ClassMethod\AddAssertArrayFromClassMethodDocblockRector\Fixture;
+
+final class FloatIntBool
+{
+    /**
+     * @param int[] $items
+     * @param float[] $numbers
+     * @param bool[] $options
+     */
+    public function run(array $items, array $numbers, array $options)
+    {
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Assert\Rector\ClassMethod\AddAssertArrayFromClassMethodDocblockRector\Fixture;
+
+final class FloatIntBool
+{
+    /**
+     * @param int[] $items
+     * @param float[] $numbers
+     * @param bool[] $options
+     */
+    public function run(array $items, array $numbers, array $options)
+    {
+        \Webmozart\Assert\Assert::allInteger($items);
+        \Webmozart\Assert\Assert::allFloat($numbers);
+        \Webmozart\Assert\Assert::allBoolean($options);
+    }
+}
+
+?>

rules/Assert/Rector/ClassMethod/AddAssertArrayFromClassMethodDocblockRector.php

@@ -4,21 +4,24 @@
 
 namespace Rector\Assert\Rector\ClassMethod;
 
-use PhpParser\Node\Expr\Variable;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\PrettyPrinter\Standard;
 use PHPStan\Type\ArrayType;
+use PHPStan\Type\BooleanType;
+use PHPStan\Type\FloatType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\StringType;
+use PHPStan\Type\Type;
 use Rector\Assert\Enum\AssertClassName;
 use Rector\Assert\NodeAnalyzer\ExistingAssertStaticCallResolver;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
@@ -133,19 +136,17 @@ public function refactor(Node $node): ?ClassMethod
                 continue;
             }
 
-            // assert value
-            if ($paramDocType->getItemType() instanceof IntegerType) {
-                $assertStaticCallStmts[] = $this->createAssertExpression($param->var, 'allInteger');
-            } elseif ($paramDocType->getItemType() instanceof StringType) {
-                $assertStaticCallStmts[] = $this->createAssertExpression($param->var, 'allString');
+            $valueAssertMethod = $this->matchTypeToAssertMethod($paramDocType->getItemType());
+
+            if (is_string($valueAssertMethod)) {
+                $assertStaticCallStmts[] = $this->createAssertExpression($param->var, $valueAssertMethod);
             }
 
-            // assert keys
-            $arrayKeys = new FuncCall(new Name('array_keys'), [new Arg($param->var)]);
-            if ($paramDocType->getKeyType() instanceof StringType) {
-                $assertStaticCallStmts[] = $this->createAssertExpression($arrayKeys, 'allString');
-            } elseif ($paramDocType->getKeyType() instanceof IntegerType) {
-                $assertStaticCallStmts[] = $this->createAssertExpression($arrayKeys, 'allInteger');
+            $keyAssertMethod = $this->matchTypeToAssertMethod($paramDocType->getKeyType());
+
+            if (is_string($keyAssertMethod)) {
+                $arrayKeys = new FuncCall(new Name('array_keys'), [new Arg($param->var)]);
+                $assertStaticCallStmts[] = $this->createAssertExpression($arrayKeys, $keyAssertMethod);
             }
         }
 
@@ -192,4 +193,25 @@ private function filterOutExistingStaticCall(array $assertStaticCallStmts, array
             return ! in_array($currentStaticCallHash, $existingAssertCallHashes, true);
         });
     }
+
+    private function matchTypeToAssertMethod(Type $type): ?string
+    {
+        if ($type instanceof IntegerType) {
+            return 'allInteger';
+        }
+
+        if ($type instanceof StringType) {
+            return 'allString';
+        }
+
+        if ($type instanceof FloatType) {
+            return 'allFloat';
+        }
+
+        if ($type instanceof BooleanType) {
+            return 'allBoolean';
+        }
+
+        return null;
+    }
 }