Narrow types

Author: sebastianbergmann

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

@@ -24,11 +24,15 @@ interface InvocationStubber
     public function method(Constraint|string $constraint): self;
 
     /**
+     * @param non-empty-string $id
+     *
      * @return $this
      */
     public function id(string $id): self;
 
     /**
+     * @param non-empty-string $id
+     *
      * @return $this
      */
     public function after(string $id): self;

src/Framework/MockObject/Runtime/InvocationHandler.php

@@ -27,7 +27,7 @@ final class InvocationHandler
     private array $matchers = [];
 
     /**
-     * @var array<string,Matcher>
+     * @var array<non-empty-string, Matcher>
      */
     private array $matcherMap = [];
 
@@ -59,6 +59,8 @@ public function hasMatchers(): bool
 
     /**
      * Looks up the match builder with identification $id and returns it.
+     *
+     * @param non-empty-string $id
      */
     public function lookupMatcher(string $id): ?Matcher
     {
@@ -69,6 +71,8 @@ public function lookupMatcher(string $id): ?Matcher
      * Registers a matcher with the identification $id. The matcher can later be
      * looked up using lookupMatcher() to figure out if it has been invoked.
      *
+     * @param non-empty-string $id
+     *
      * @throws MatcherAlreadyRegisteredException
      */
     public function registerMatcher(string $id, Matcher $matcher): void

src/Framework/MockObject/Runtime/InvocationStubberImplementation.php

@@ -96,6 +96,8 @@ public function method(Constraint|PropertyHook|string $constraint): InvocationSt
     }
 
     /**
+     * @param non-empty-string $id
+     *
      * @throws MatcherAlreadyRegisteredException
      *
      * @return $this
@@ -108,6 +110,8 @@ public function id(string $id): InvocationStubber
     }
 
     /**
+     * @param non-empty-string $id
+     *
      * @return $this
      */
     public function after(string $id): InvocationStubber

src/Framework/MockObject/Runtime/Matcher.php

@@ -29,6 +29,10 @@
 final class Matcher
 {
     private readonly InvocationOrder $invocationRule;
+
+    /**
+     * @var ?non-empty-string
+     */
     private ?string $afterMatchBuilderId    = null;
     private ?MethodName $methodNameRule     = null;
     private ?ParametersRule $parametersRule = null;
@@ -74,6 +78,9 @@ public function setStub(Stub $stub): void
         $this->stub = $stub;
     }
 
+    /**
+     * @param non-empty-string $id
+     */
     public function setAfterMatchBuilderId(string $id): void
     {
         $this->afterMatchBuilderId = $id;