diff --git a/duchain/tests/duchain.h b/duchain/tests/duchain.h
--- a/duchain/tests/duchain.h
+++ b/duchain/tests/duchain.h
@@ -153,6 +153,7 @@
     void useThisAsArray();
     void wrongUseOfThisAsArray();
     void staticFunctionClassPhp54();
+    void functionArgumentUnpacking_data();
     void functionArgumentUnpacking();
 };
 
diff --git a/duchain/tests/duchain.cpp b/duchain/tests/duchain.cpp
--- a/duchain/tests/duchain.cpp
+++ b/duchain/tests/duchain.cpp
@@ -3045,21 +3045,25 @@
     QCOMPARE(classDec->uses().count(),1);
 }
 
+void TestDUChain::functionArgumentUnpacking_data()
+{
+    QTest::addColumn<QString>("code");
+
+    QTest::newRow("unpackVariable") << QStringLiteral("<? $a = [ 1,2 ];\n$b = [ 3,4 ];\nfunction aaa($c,$d,$e,$f) { }\naaa(...$a, ...$b);\n");
+
+    QTest::newRow("unpackLiteral") << QStringLiteral("<? function aaa($c,$d,$e,$f) { }\naaa(...[1,2], ...[3,4]);\n");
+
+    QTest::newRow("unpackFunction") << QStringLiteral("<? function bbb() { return [1,2,3,4]; }\nfunction aaa($c,$d,$e,$f) { }\naaa(...bbb());\n");
+}
+
 void TestDUChain::functionArgumentUnpacking()
 {
-    //                 0         1         2         3         4         5         6         7
-    //                 01234567890123456789012345678901234567890123456789012345678901234567890123456789
-    QByteArray method("<?php\n"
-                      "$a = [ 1,2 ];\n"
-                      "$b = [ 3,4 ];\n"
-                      "function aaa($c,$d,$e,$f) { }\n"
-                      "aaa(...$a, ...$b);\n");
+    QFETCH(QString, code);
 
-    TopDUContext* top = parse(method);
+    TopDUContext* top = parse(code.toUtf8(), DumpNone);
     QVERIFY(top);
     DUChainReleaser releaseTop(top);
     DUChainWriteLocker lock(DUChain::lock());
 
     QVERIFY(top->problems().isEmpty());
-    QCOMPARE(top->localDeclarations().count(),3);
 }
diff --git a/parser/php.g b/parser/php.g
--- a/parser/php.g
+++ b/parser/php.g
@@ -599,7 +599,7 @@
     #parameters=functionCallParameterListElement @ COMMA | 0
 -> functionCallParameterList ;;
 
-    (BIT_AND variable=variable) | (isVariadic=ELLIPSIS variable=variable) | expr=expr
+    (BIT_AND variable=variable) | (isVariadic=ELLIPSIS | 0) expr=expr
 -> functionCallParameterListElement ;;
 
     #element=assignmentListElement @COMMA