Merge branch '8.3'

src/Framework/InvalidParameterGroupException.php

@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Framework;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class InvalidParameterGroupException extends Exception
+{
+}

src/Framework/MockObject/Matcher/ConsecutiveParameters.php

@@ -12,6 +12,7 @@
 use PHPUnit\Framework\Constraint\Constraint;
 use PHPUnit\Framework\Constraint\IsEqual;
 use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\InvalidParameterGroupException;
 use PHPUnit\Framework\MockObject\Invocation as BaseInvocation;
 
 /**
@@ -35,6 +36,16 @@ final class ConsecutiveParameters extends StatelessInvocation
     public function __construct(array $parameterGroups)
     {
         foreach ($parameterGroups as $index => $parameters) {
+            if (!\is_iterable($parameters)) {
+                throw new InvalidParameterGroupException(
+                    \sprintf(
+                        'Parameter group #%d must be an array or Traversable, got %s',
+                        $index,
+                        \gettype($parameters)
+                    )
+                );
+            }
+
             foreach ($parameters as $parameter) {
                 if (!$parameter instanceof Constraint) {
                     $parameter = new IsEqual($parameter);

tests/unit/Framework/MockObject/Matcher/ConsecutiveParametersTest.php

@@ -9,6 +9,7 @@
  */
 
 use PHPUnit\Framework\ExpectationFailedException;
+use PHPUnit\Framework\InvalidParameterGroupException;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -68,4 +69,21 @@ public function testIntegrationExpectingException(): void
 
         $mock->foo('invalid');
     }
+
+    public function testIntegrationFailsWithNonIterableParameterGroup(): void
+    {
+        $mock = $this->getMockBuilder(stdClass::class)
+            ->setMethods(['foo'])
+            ->getMock();
+
+        $this->expectException(InvalidParameterGroupException::class);
+        $this->expectExceptionMessage('Parameter group #1 must be an array or Traversable, got object');
+
+        $mock->expects($this->any())
+            ->method('foo')
+            ->withConsecutive(
+                ['bar'],
+                $this->identicalTo([21, 42]) // this is not an array
+            );
+    }
 }