Merge pull request pact-foundation#588 from tienvx/use-intersection-t…

…ypes-feature refactor: Use intersection types
tienvx · May 2, 2024 · 2100176 · 2100176
2 parents 0a03f3f + 8c90b3a
commit 2100176
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/src/PhpPact/Consumer/Matcher/Matcher.php b/src/PhpPact/Consumer/Matcher/Matcher.php
@@ -3,7 +3,6 @@
 namespace PhpPact\Consumer\Matcher;
 
 use PhpPact\Consumer\Matcher\Exception\MatcherException;
-use PhpPact\Consumer\Matcher\Exception\MatcherNotSupportedException;
 use PhpPact\Consumer\Matcher\Generators\MockServerURL;
 use PhpPact\Consumer\Matcher\Generators\ProviderState;
 use PhpPact\Consumer\Matcher\Generators\RandomHexadecimal;
@@ -334,15 +333,9 @@ public function string(?string $value = null): MatcherInterface
 
     /**
      * Generates a value that is looked up from the provider state context using the given expression
-     *
-     * @throws MatcherNotSupportedException
      */
-    public function fromProviderState(MatcherInterface $matcher, string $expression): MatcherInterface
+    public function fromProviderState(MatcherInterface&GeneratorAwareInterface $matcher, string $expression): MatcherInterface
     {
-        if (!$matcher instanceof GeneratorAwareInterface) {
-            throw new MatcherNotSupportedException(sprintf("Matcher '%s' must be generator aware", $matcher->getType()));
-        }
-
         $matcher->setGenerator(new ProviderState($expression));
 
         return $matcher;

diff --git a/tests/PhpPact/Consumer/Matcher/MatcherTest.php b/tests/PhpPact/Consumer/Matcher/MatcherTest.php
@@ -3,7 +3,6 @@
 namespace PhpPactTest\Consumer\Matcher;
 
 use PhpPact\Consumer\Matcher\Exception\MatcherException;
-use PhpPact\Consumer\Matcher\Exception\MatcherNotSupportedException;
 use PhpPact\Consumer\Matcher\Formatters\MinimalFormatter;
 use PhpPact\Consumer\Matcher\Formatters\ValueOptionalFormatter;
 use PhpPact\Consumer\Matcher\Generators\MockServerURL;
@@ -252,13 +251,6 @@ public function testString(): void
         $this->assertInstanceOf(StringValue::class, $this->matcher->string('test string'));
     }
 
-    public function testFromProviderStateMatcherNotSupport(): void
-    {
-        $this->expectException(MatcherNotSupportedException::class);
-        $this->expectExceptionMessage("Matcher 'type' must be generator aware");
-        $this->matcher->fromProviderState(new Type('text'), '${text}');
-    }
-
     public function testFromProviderState(): void
     {
         $uuid = $this->matcher->uuid();