Fix codeclimate warnings (#18)

Author: martin-helmich

src/Constraint/UrlEncodedMatches.php

@@ -18,7 +18,7 @@ public function __construct($nameMatcher, $valueMatcher = null)
 
         if ($valueMatcher === null) {
             $valueMatcher = new IsAnything();
-        } else if (!($valueMatcher instanceof Constraint)) {
+        } elseif (!($valueMatcher instanceof Constraint)) {
             $valueMatcher = new IsEqual($valueMatcher);
         }
 
@@ -31,15 +31,12 @@ protected function matches($other): bool
         parse_str($other, $parsedQuery);
 
         foreach ($parsedQuery as $key => $value) {
-            if (!$this->nameMatcher->evaluate($key, "", true)) {
-                continue;
-            }
+            $nameMatches = $this->nameMatcher->evaluate($key, "", true);
+            $valueMatches = $this->valueMatcher->evaluate($value, "", true);
 
-            if (!$this->valueMatcher->evaluate($value, "", true)) {
-                continue;
+            if ($nameMatches && $valueMatches) {
+                return true;
             }
-
-            return true;
         }
 
         return false;
@@ -50,5 +47,4 @@ public function toString(): string
         return 'contains a name matching ' . $this->nameMatcher->toString() . ' and value matching ' . $this->valueMatcher->toString();
     }
 
-
 }

tests/Unit/Constraint/UrlEncodedMatchesTest.php

@@ -0,0 +1,32 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Helmich\Psr7Assert\Tests\Unit\Constraint;
+
+use GuzzleHttp\Psr7\Request;
+use Helmich\Psr7Assert\Constraint\HasUriConstraint;
+use Helmich\Psr7Assert\Constraint\UrlEncodedMatches;
+use PHPUnit\Framework\AssertionFailedError;
+use PHPUnit\Framework\TestCase;
+
+class UrlEncodedMatchesTest extends TestCase
+{
+    public function testMatchesValueWithCorrectKeyAndValue()
+    {
+        $constraint = new UrlEncodedMatches("foo", "bar");
+        self::assertTrue($constraint->evaluate("foo=bar&baz=foo", "", true));
+    }
+
+    public function testDoesNotMatchValueWithIncorrectValue()
+    {
+        $constraint = new UrlEncodedMatches("foo", "wrong");
+        self::assertFalse($constraint->evaluate("foo=bar&baz=foo", "", true));
+    }
+
+    public function testDoesNotMatchValueWithIncorrectKey()
+    {
+        $constraint = new UrlEncodedMatches("wrong", "bar");
+        self::assertFalse($constraint->evaluate("foo=bar&baz=foo", "", true));
+    }
+}