From 693811abed6c43247a41bb881ed6fdb25e108df3 Mon Sep 17 00:00:00 2001
From: Matthew Brown <github@muglug.com>
Date: Tue, 17 Jan 2017 00:26:40 -0500
Subject: [PATCH] Allow non-array docblock typehints for variadic params

---
 src/Psalm/Checker/FunctionLikeChecker.php | 13 +++++++++++--
 tests/Php56Test.php                       |  2 ++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Psalm/Checker/FunctionLikeChecker.php b/src/Psalm/Checker/FunctionLikeChecker.php
index 50bbd3214..7af9bc688 100644
--- a/src/Psalm/Checker/FunctionLikeChecker.php
+++ b/src/Psalm/Checker/FunctionLikeChecker.php
@@ -978,7 +978,7 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
     }
 
     /**
-     * @param  array<array{type:string,name:string,line_number:int}>  $docblock_params
+     * @param  array<int, array{type:string,name:string,line_number:int}>  $docblock_params
      * @param  FunctionLikeStorage          $storage
      * @param  StatementsSource             $source
      * @param  string|null                  $fq_class_name
@@ -999,7 +999,7 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
         $method_id = $base . strtolower($storage->cased_name);
         $cased_method_id = $base . $storage->cased_name;
 
-        foreach ($docblock_params as $docblock_param) {
+        foreach ($docblock_params as $i => $docblock_param) {
             $param_name = $docblock_param['name'];
             $line_number = $docblock_param['line_number'];
 
@@ -1031,6 +1031,15 @@ abstract class FunctionLikeChecker extends SourceChecker implements StatementsSo
             $new_param_type->from_docblock = true;
 
             if (!$storage->param_types[$param_name]->isMixed()) {
+                if ($storage->params[$i]->is_variadic) {
+                    $new_param_type = new Type\Union([
+                        new Type\Atomic\TArray([
+                            Type::getInt(),
+                            $new_param_type
+                        ])
+                    ]);
+                }
+
                 if (!TypeChecker::isContainedBy(
                     $new_param_type,
                     $storage->param_types[$param_name],
diff --git a/tests/Php56Test.php b/tests/Php56Test.php
index eecba97c1..1d6489976 100644
--- a/tests/Php56Test.php
+++ b/tests/Php56Test.php
@@ -118,6 +118,7 @@ class Php56Test extends PHPUnit_Framework_TestCase
     {
         $stmts = self::$parser->parse('<?php
         /**
+         * @param int $a_list
          * @return array<int>
          */
         function f(int ...$a_list) {
@@ -151,6 +152,7 @@ class Php56Test extends PHPUnit_Framework_TestCase
     {
         $stmts = self::$parser->parse('<?php
         /**
+         * @param int $a_list
          * @return void
          */
         function f(int ...$a_list) {