Improve error message

src/Framework/MockObject/Exception/NoMoreReturnValuesConfiguredException.php

@@ -0,0 +1,32 @@
+<?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\MockObject;
+
+use function sprintf;
+
+/**
+ * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class NoMoreReturnValuesConfiguredException extends \PHPUnit\Framework\Exception implements Exception
+{
+ public function __construct(Invocation $invocation, int $numberOfConfiguredReturnValues)
+ {
+ parent::__construct(
+ sprintf(
+ 'Only %d return values have been configured for %s::%s()',
+ $numberOfConfiguredReturnValues,
+ $invocation->className(),
+ $invocation->methodName(),
+ ),
+ );
+ }
+}

src/Framework/MockObject/Runtime/Stub/ConsecutiveCalls.php

@@ -10,7 +10,9 @@
 namespace PHPUnit\Framework\MockObject\Stub;
 
 use function array_shift;
+use function count;
 use PHPUnit\Framework\MockObject\Invocation;
+use PHPUnit\Framework\MockObject\NoMoreReturnValuesConfiguredException;
 
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
@@ -20,14 +22,26 @@
 final class ConsecutiveCalls implements Stub
 {
  private array $stack;
+ private int $numberOfConfiguredReturnValues;
 
  public function __construct(array $stack)
  {
- $this->stack = $stack;
+ $this->stack = $stack;
+ $this->numberOfConfiguredReturnValues = count($stack);
  }
 
+ /**
+ * @throws NoMoreReturnValuesConfiguredException
+ */
  public function invoke(Invocation $invocation): mixed
  {
+ if (empty($this->stack)) {
+ throw new NoMoreReturnValuesConfiguredException(
+ $invocation,
+ $this->numberOfConfiguredReturnValues,
+ );
+ }
+
  $value = array_shift($this->stack);
 
  if ($value instanceof Stub) {

tests/unit/Framework/MockObject/TestDoubleTestCase.php

@@ -18,7 +18,6 @@
 use PHPUnit\TestFixture\MockObject\InterfaceWithNeverReturningMethod;
 use PHPUnit\TestFixture\MockObject\InterfaceWithReturnTypeDeclaration;
 use stdClass;
-use TypeError;
 
 abstract class TestDoubleTestCase extends TestCase
 {
@@ -198,7 +197,8 @@ final public function testMethodConfiguredToReturnDifferentValuesOnConsecutiveCa
  $this->assertFalse($double->doSomething());
  $this->assertTrue($double->doSomething());
 
- $this->expectException(TypeError::class);
+ $this->expectException(NoMoreReturnValuesConfiguredException::class);
+ $this->expectExceptionMessage('Only 2 return values have been configured for PHPUnit\TestFixture\MockObject\InterfaceWithReturnTypeDeclaration::doSomething()');
 
  $double->doSomething();
  }