Merge branch '12.0'

Author: sebastianbergmann

src/Framework/MockObject/Runtime/Api/Method.php

@@ -10,7 +10,6 @@
 namespace PHPUnit\Framework\MockObject;
 
 use PHPUnit\Framework\Constraint\Constraint;
-use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
 use PHPUnit\Framework\MockObject\Rule\AnyInvokedCount;
 use PHPUnit\Framework\MockObject\Runtime\PropertyHook;
 
@@ -23,7 +22,7 @@ trait Method
 {
     abstract public function __phpunit_getInvocationHandler(): InvocationHandler;
 
-    public function method(Constraint|PropertyHook|string $constraint): InvocationMocker
+    public function method(Constraint|PropertyHook|string $constraint): InvocationStubberImplementation
     {
         return $this
             ->__phpunit_getInvocationHandler()

src/Framework/MockObject/Runtime/Api/MockObjectApi.php

@@ -9,7 +9,7 @@
  */
 namespace PHPUnit\Framework\MockObject;
 
-use PHPUnit\Framework\MockObject\Builder\InvocationMocker as InvocationMockerBuilder;
+use PHPUnit\Framework\MockObject\InvocationStubberImplementation as InvocationMockerBuilder;
 use PHPUnit\Framework\MockObject\Rule\InvocationOrder;
 
 /**

src/Framework/MockObject/Runtime/Builder/Identity.php

@@ -7,8 +7,9 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace PHPUnit\Framework\MockObject\Builder;
+namespace PHPUnit\Framework\MockObject;
 
+use PHPUnit\Framework\Constraint\Constraint;
 use PHPUnit\Framework\MockObject\Stub\Stub;
 use Throwable;
 
@@ -17,24 +18,70 @@
  */
 interface InvocationStubber
 {
-    public function will(Stub $stub): Identity;
+    /**
+     * @return $this
+     */
+    public function method(Constraint|string $constraint): self;
+
+    /**
+     * @return $this
+     */
+    public function after(string $id): self;
+
+    /**
+     * @return $this
+     */
+    public function with(mixed ...$arguments): self;
+
+    /**
+     * @return $this
+     */
+    public function withAnyParameters(): self;
+
+    /**
+     * @return $this
+     */
+    public function will(Stub $stub): self;
 
+    /**
+     * @return $this
+     */
     public function willReturn(mixed $value, mixed ...$nextValues): self;
 
+    /**
+     * @return $this
+     */
     public function willReturnReference(mixed &$reference): self;
 
     /**
      * @param array<int, array<int, mixed>> $valueMap
+     *
+     * @return $this
      */
     public function willReturnMap(array $valueMap): self;
 
+    /**
+     * @return $this
+     */
     public function willReturnArgument(int $argumentIndex): self;
 
+    /**
+     * @return $this
+     */
     public function willReturnCallback(callable $callback): self;
 
+    /**
+     * @return $this
+     */
     public function willReturnSelf(): self;
 
+    /**
+     * @return $this
+     */
     public function willReturnOnConsecutiveCalls(mixed ...$values): self;
 
+    /**
+     * @return $this
+     */
     public function willThrowException(Throwable $exception): self;
 }

src/Framework/MockObject/Runtime/Builder/MethodNameMatch.php

@@ -9,13 +9,12 @@
  */
 namespace PHPUnit\Framework\MockObject;
 
-use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
 use PHPUnit\Framework\MockObject\Rule\InvocationOrder;
 
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  */
 interface MockObject extends Stub
 {
-    public function expects(InvocationOrder $invocationRule): InvocationMocker;
+    public function expects(InvocationOrder $invocationRule): InvocationStubber;
 }

src/Framework/MockObject/Runtime/Builder/ParametersMatch.php

@@ -10,7 +10,6 @@
 namespace PHPUnit\Framework\MockObject;
 
 use PHPUnit\Framework\Constraint\Constraint;
-use PHPUnit\Framework\MockObject\Builder\InvocationStubber;
 use PHPUnit\Framework\MockObject\Runtime\PropertyHook;
 
 /**

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

@@ -11,7 +11,6 @@
 
 use function strtolower;
 use Exception;
-use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
 use PHPUnit\Framework\MockObject\Rule\InvocationOrder;
 use Throwable;
 
@@ -81,12 +80,12 @@ public function registerMatcher(string $id, Matcher $matcher): void
         $this->matcherMap[$id] = $matcher;
     }
 
-    public function expects(InvocationOrder $rule): InvocationMocker
+    public function expects(InvocationOrder $rule): InvocationStubberImplementation
     {
         $matcher = new Matcher($rule);
         $this->addMatcher($matcher);
 
-        return new InvocationMocker(
+        return new InvocationStubberImplementation(
             $this,
             $matcher,
             ...$this->configurableMethods,