Reorder methods

Author: sebastianbergmann

src/Framework/MockObject/Runtime/Interface/InvocationStubber.php

@@ -18,13 +18,13 @@
  */
 interface InvocationStubber
 {
-    public function id(string $id): self;
-
     /**
      * @return $this
      */
     public function method(Constraint|string $constraint): self;
 
+    public function id(string $id): self;
+
     /**
      * @return $this
      */

src/Framework/MockObject/Runtime/InvocationStubberImplementation.php

@@ -60,6 +60,41 @@ public function __construct(InvocationHandler $handler, Matcher $matcher, Config
         $this->configurableMethods = $configurableMethods;
     }
 
+    /**
+     * @throws InvalidArgumentException
+     * @throws MethodCannotBeConfiguredException
+     * @throws MethodNameAlreadyConfiguredException
+     *
+     * @return $this
+     */
+    public function method(Constraint|PropertyHook|string $constraint): InvocationStubber
+    {
+        if ($this->matcher->hasMethodNameRule()) {
+            throw new MethodNameAlreadyConfiguredException;
+        }
+
+        if ($constraint instanceof PropertyHook) {
+            $constraint = $constraint->asString();
+        }
+
+        if (is_string($constraint)) {
+            $this->configurableMethodNames ??= array_flip(
+                array_map(
+                    static fn (ConfigurableMethod $configurable) => strtolower($configurable->name()),
+                    $this->configurableMethods,
+                ),
+            );
+
+            if (!array_key_exists(strtolower($constraint), $this->configurableMethodNames)) {
+                throw new MethodCannotBeConfiguredException($constraint);
+            }
+        }
+
+        $this->matcher->setMethodNameRule(new Rule\MethodName($constraint));
+
+        return $this;
+    }
+
     /**
      * @throws MatcherAlreadyRegisteredException
      *
@@ -72,6 +107,47 @@ public function id(string $id): InvocationStubber
         return $this;
     }
 
+    /**
+     * @return $this
+     */
+    public function after(string $id): InvocationStubber
+    {
+        $this->matcher->setAfterMatchBuilderId($id);
+
+        return $this;
+    }
+
+    /**
+     * @throws \PHPUnit\Framework\Exception
+     * @throws MethodNameNotConfiguredException
+     * @throws MethodParametersAlreadyConfiguredException
+     *
+     * @return $this
+     */
+    public function with(mixed ...$arguments): InvocationStubber
+    {
+        $this->ensureParametersCanBeConfigured();
+
+        $this->matcher->setParametersRule(new Rule\Parameters($arguments));
+
+        return $this;
+    }
+
+    /**
+     * @throws MethodNameNotConfiguredException
+     * @throws MethodParametersAlreadyConfiguredException
+     *
+     * @return $this
+     */
+    public function withAnyParameters(): InvocationStubber
+    {
+        $this->ensureParametersCanBeConfigured();
+
+        $this->matcher->setParametersRule(new Rule\AnyParameters);
+
+        return $this;
+    }
+
     /**
      * @return $this
      */
@@ -191,82 +267,6 @@ public function willThrowException(Throwable $exception): InvocationStubber
         return $this->will($stub);
     }
 
-    /**
-     * @return $this
-     */
-    public function after(string $id): InvocationStubber
-    {
-        $this->matcher->setAfterMatchBuilderId($id);
-
-        return $this;
-    }
-
-    /**
-     * @throws \PHPUnit\Framework\Exception
-     * @throws MethodNameNotConfiguredException
-     * @throws MethodParametersAlreadyConfiguredException
-     *
-     * @return $this
-     */
-    public function with(mixed ...$arguments): InvocationStubber
-    {
-        $this->ensureParametersCanBeConfigured();
-
-        $this->matcher->setParametersRule(new Rule\Parameters($arguments));
-
-        return $this;
-    }
-
-    /**
-     * @throws MethodNameNotConfiguredException
-     * @throws MethodParametersAlreadyConfiguredException
-     *
-     * @return $this
-     */
-    public function withAnyParameters(): InvocationStubber
-    {
-        $this->ensureParametersCanBeConfigured();
-
-        $this->matcher->setParametersRule(new Rule\AnyParameters);
-
-        return $this;
-    }
-
-    /**
-     * @throws InvalidArgumentException
-     * @throws MethodCannotBeConfiguredException
-     * @throws MethodNameAlreadyConfiguredException
-     *
-     * @return $this
-     */
-    public function method(Constraint|PropertyHook|string $constraint): InvocationStubber
-    {
-        if ($this->matcher->hasMethodNameRule()) {
-            throw new MethodNameAlreadyConfiguredException;
-        }
-
-        if ($constraint instanceof PropertyHook) {
-            $constraint = $constraint->asString();
-        }
-
-        if (is_string($constraint)) {
-            $this->configurableMethodNames ??= array_flip(
-                array_map(
-                    static fn (ConfigurableMethod $configurable) => strtolower($configurable->name()),
-                    $this->configurableMethods,
-                ),
-            );
-
-            if (!array_key_exists(strtolower($constraint), $this->configurableMethodNames)) {
-                throw new MethodCannotBeConfiguredException($constraint);
-            }
-        }
-
-        $this->matcher->setMethodNameRule(new Rule\MethodName($constraint));
-
-        return $this;
-    }
-
     /**
      * @throws MethodNameNotConfiguredException
      * @throws MethodParametersAlreadyConfiguredException