Make it work

Author: martin-helmich

src/Constraint/HasQueryParameterConstraint.php

@@ -3,32 +3,19 @@
 namespace Helmich\Psr7Assert\Constraint;
 
 use PHPUnit\Framework\Constraint\Constraint;
-use PHPUnit\Framework\Constraint\IsAnything;
-use PHPUnit\Framework\Constraint\IsEqual;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
 
 class HasQueryParameterConstraint extends Constraint
 {
-    private $nameMatcher;
-    private $valueMatcher;
+    /** @var UrlEncodedMatches */
+    private $inner;
 
     public function __construct($nameMatcher, $valueMatcher = null)
     {
         parent::__construct();
 
-        if (!($nameMatcher instanceof Constraint)) {
-            $nameMatcher = new IsEqual($nameMatcher);
-        }
-
-        if ($valueMatcher === null) {
-            $valueMatcher = new IsAnything();
-        } else if (!($valueMatcher instanceof Constraint)) {
-            $valueMatcher = new IsEqual($valueMatcher);
-        }
-
-        $this->nameMatcher = $nameMatcher;
-        $this->valueMatcher = $valueMatcher;
+        $this->inner = new UrlEncodedMatches($nameMatcher, $valueMatcher);
     }
 
     protected function matches($other): bool
@@ -66,26 +53,12 @@ private function matchesString(string $other): bool
 
     private function matchesQueryString(string $query): bool
     {
-        parse_str($query, $parsedQuery);
-
-        foreach ($parsedQuery as $key => $value) {
-            if (!$this->nameMatcher->evaluate($key, "", true)) {
-                continue;
-            }
-
-            if (!$this->valueMatcher->evaluate($value, "", true)) {
-                continue;
-            }
-
-            return true;
-        }
-
-        return false;
+        return $this->inner->evaluate($query, "", true);
     }
 
 
     public function toString(): string
     {
-        return 'has a query parameter with a name matching ' . $this->nameMatcher->toString() . ' and value matching ' . $this->valueMatcher->toString();
+        return 'query string ' . $this->inner->toString();
     }
 }

src/Constraint/UrlEncodedMatches.php

@@ -0,0 +1,56 @@
+<?php
+namespace Helmich\Psr7Assert\Constraint;
+
+use PHPUnit\Framework\Constraint\Constraint;
+use PHPUnit\Framework\Constraint\IsAnything;
+use PHPUnit\Framework\Constraint\IsEqual;
+
+class UrlEncodedMatches extends Constraint
+{
+    private $nameMatcher;
+    private $valueMatcher;
+
+    public function __construct($nameMatcher, $valueMatcher = null)
+    {
+        parent::__construct();
+
+        if (!($nameMatcher instanceof Constraint)) {
+            $nameMatcher = new IsEqual($nameMatcher);
+        }
+
+        if ($valueMatcher === null) {
+            $valueMatcher = new IsAnything();
+        } else if (!($valueMatcher instanceof Constraint)) {
+            $valueMatcher = new IsEqual($valueMatcher);
+        }
+
+        $this->nameMatcher = $nameMatcher;
+        $this->valueMatcher = $valueMatcher;
+    }
+
+    protected function matches($other): bool
+    {
+        parse_str($other, $parsedQuery);
+
+        foreach ($parsedQuery as $key => $value) {
+            if (!$this->nameMatcher->evaluate($key, "", true)) {
+                continue;
+            }
+
+            if (!$this->valueMatcher->evaluate($value, "", true)) {
+                continue;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    public function toString(): string
+    {
+        return 'contains a name matching ' . $this->nameMatcher->toString() . ' and value matching ' . $this->valueMatcher->toString();
+    }
+
+
+}

src/Constraint/UrlEncodedMatchesMany.php

@@ -0,0 +1,38 @@
+<?php
+namespace Helmich\Psr7Assert\Constraint;
+
+use PHPUnit\Framework\Constraint\Constraint;
+
+class UrlEncodedMatchesMany extends Constraint
+{
+    /** @var UrlEncodedMatches[] */
+    private $constraints = [];
+
+    public function __construct(array $constraints)
+    {
+        parent::__construct();
+
+        foreach ($constraints as $key => $value) {
+            $this->constraints[] = new UrlEncodedMatches($key, $value);
+        }
+    }
+
+    protected function matches($other): bool
+    {
+        foreach ($this->constraints as $constraint) {
+            if (!$constraint->evaluate($other, "", true)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+
+    public function toString(): string
+    {
+        return join(" and ", array_map(function(HasQueryParameterConstraint $c) {
+            return $c->toString();
+        }, $this->constraints));
+    }
+}

src/Psr7Assertions.php

@@ -11,6 +11,7 @@
 use Helmich\Psr7Assert\Constraint\HasStatusConstraint;
 use Helmich\Psr7Assert\Constraint\HasUriConstraint;
 use Helmich\Psr7Assert\Constraint\IsAbsoluteUriConstraint;
+use Helmich\Psr7Assert\Constraint\UrlEncodedMatchesMany;
 use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\Constraint\Constraint;
 use PHPUnit\Framework\Constraint\IsEqual;
@@ -230,7 +231,7 @@ public static function bodyMatchesForm(array $constraints): Constraint
     {
         return Assert::logicalAnd(
             self::hasHeader('content-type', Assert::matchesRegularExpression(',^application/x-www-form-urlencoded(;.+)?$,')),
-            self::bodyMatches(new HasQueryParametersConstraint($constraints))
+            self::bodyMatches(new UrlEncodedMatchesMany($constraints))
         );
     }
 

tests/Unit/Constraint/HasQueryParametersConstraintTest.php

@@ -2,11 +2,8 @@
 declare(strict_types = 1);
 namespace Helmich\Psr7Assert\Tests\Unit\Constraint;
 
-use GuzzleHttp\Psr7\Request;
-use Helmich\Psr7Assert\Constraint\HasQueryParameterConstraint;
 use Helmich\Psr7Assert\Constraint\HasQueryParametersConstraint;
 use PHPUnit\Framework\TestCase;
-use function GuzzleHttp\Psr7\uri_for;
 
 class HasQueryParametersConstraintTest extends TestCase
 {