update deps

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1']
+        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
     steps:
       - name: Check out code into the workspace
         uses: actions/checkout@v2

README.md

@@ -1,4 +1,4 @@
-![Build Status](https://img.shields.io/github/workflow/status/Neur0toxine/pock/Tests?style=flat-square)
+![Build Status](https://img.shields.io/github/actions/workflow/status/Neur0toxine/pock/tests.yml?branch=master&style=flat-square)
 [![Coverage](https://img.shields.io/codecov/c/gh/Neur0toxine/pock/master.svg?logo=codecov&logoColor=white&style=flat-square)](https://codecov.io/gh/Neur0toxine/pock)
 [![Latest stable](https://img.shields.io/packagist/v/neur0toxine/pock.svg?style=flat-square)](https://packagist.org/packages/neur0toxine/pock)
 [![PHP from Packagist](https://img.shields.io/packagist/php-v/neur0toxine/pock.svg?logo=php&logoColor=white&style=flat-square)](https://packagist.org/packages/neur0toxine/pock)

composer.json

@@ -34,7 +34,7 @@
         "php": ">=7.2.0",
         "ext-json": "*",
         "psr/http-client": "^1.0",
-        "psr/http-message": "^1.0",
+        "psr/http-message": "^1.0 || ^2.0",
         "php-http/httplug": "^1.0 || ^2.0",
         "nyholm/psr7": "^1.4",
         "riverline/multipart-parser": "^2.0"
@@ -73,5 +73,11 @@
             "@lint",
             "@phpunit"
         ]
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "php-http/discovery": true
+        }
     }
 }

phpstan-baseline.neon

@@ -5,11 +5,6 @@ parameters:
 			count: 1
 			path: src/Client.php
 
-		-
-			message: "#^Method Pock\\\\Comparator\\\\ComparatorLocator\\:\\:get\\(\\) should return Pock\\\\Comparator\\\\ComparatorInterface but returns object\\.$#"
-			count: 1
-			path: src/Comparator/ComparatorLocator.php
-
 		-
 			message: "#^Static property Pock\\\\Comparator\\\\ComparatorLocator\\:\\:\\$comparators \\(array\\<Pock\\\\Comparator\\\\ComparatorInterface\\>\\) does not accept array\\<object\\>\\.$#"
 			count: 1
@@ -20,21 +15,6 @@ parameters:
 			count: 3
 			path: src/Comparator/ComparatorLocator.php
 
-		-
-			message: "#^Parameter \\#1 \\$object_or_class of function method_exists expects object\\|string, mixed given\\.$#"
-			count: 1
-			path: src/Creator/AbstractJmsSerializerCreator.php
-
-		-
-			message: "#^Parameter \\#2 \\$encoders of class Symfony\\\\Component\\\\Serializer\\\\Serializer constructor expects array\\<Symfony\\\\Component\\\\Serializer\\\\Encoder\\\\DecoderInterface\\|Symfony\\\\Component\\\\Serializer\\\\Encoder\\\\EncoderInterface\\>, array\\<int, object\\> given\\.$#"
-			count: 1
-			path: src/Creator/AbstractSymfonySerializerCreator.php
-
-		-
-			message: "#^Method Pock\\\\Factory\\\\CallbackReplyFactory\\:\\:createReply\\(\\) should return Psr\\\\Http\\\\Message\\\\ResponseInterface but returns mixed\\.$#"
-			count: 1
-			path: src/Factory/CallbackReplyFactory.php
-
 		-
 			message: "#^Unsafe access to private property Pock\\\\Factory\\\\JsonSerializerFactory\\:\\:\\$mainSerializer through static\\:\\:\\.$#"
 			count: 2
@@ -46,9 +26,9 @@ parameters:
 			path: src/Factory/XmlSerializerFactory.php
 
 		-
-			message: "#^Method Pock\\\\Matchers\\\\CallbackRequestMatcher\\:\\:matches\\(\\) should return bool but returns mixed\\.$#"
+			message: "#^Parameter \\#4 \\$flags of function preg_match expects TFlags of 0\\|256\\|512\\|768, int given\\.$#"
 			count: 1
-			path: src/Matchers/CallbackRequestMatcher.php
+			path: src/Matchers/AbstractRegExpMatcher.php
 
 		-
 			message: "#^Unsafe call to private method Pock\\\\Matchers\\\\ExactHeadersMatcher\\:\\:headerValuesEqual\\(\\) through static\\:\\:\\.$#"
@@ -66,9 +46,9 @@ parameters:
 			path: src/Matchers/JsonBodyMatcher.php
 
 		-
-			message: "#^Method Pock\\\\Matchers\\\\MultipartFormDataMatcher\\:\\:matches\\(\\) should return bool but returns mixed\\.$#"
+			message: "#^Method Pock\\\\Matchers\\\\QueryMatcher\\:\\:parseQuery\\(\\) should return array\\<string, mixed\\> but returns array\\<int\\|string, array\\|string\\>\\.$#"
 			count: 1
-			path: src/Matchers/MultipartFormDataMatcher.php
+			path: src/Matchers/QueryMatcher.php
 
 		-
 			message: "#^Method Pock\\\\Matchers\\\\XmlBodyMatcher\\:\\:sortXmlTags\\(\\) should return string but returns string\\|null\\.$#"
@@ -129,4 +109,3 @@ parameters:
 			message: "#^Parameter \\#3 \\$depth of function json_encode expects int\\<1, max\\>, int given\\.$#"
 			count: 1
 			path: src/PockResponseBuilder.php
-

src/Comparator/RecursiveArrayComparator.php

@@ -50,8 +50,12 @@ class RecursiveArrayComparator implements ComparatorInterface
         }
 
         foreach ($first as $key => $value) {
-            if (is_array($value) && !self::recursiveCompareArrays($value, $second[$key])) {
+            if (is_array($value)) {
-                return false;
+                if (!is_array($second[$key]) || !self::recursiveCompareArrays($value, $second[$key])) {
+                    return false;
+                }
+
+                continue;
             }
 
             if ($value !== $second[$key]) {

src/Comparator/RecursiveLtrArrayComparator.php

@@ -47,11 +47,12 @@ class RecursiveLtrArrayComparator extends RecursiveArrayComparator
         }
 
         foreach ($needle as $key => $value) {
-            if (
+            if (is_array($value)) {
-                is_array($value) &&
+                if (!is_array($haystack[$key]) || !self::recursiveCompareArrays($value, $haystack[$key])) {
-                (!is_array($haystack[$key]) || !self::recursiveCompareArrays($value, $haystack[$key]))
+                    return false;
-            ) {
+                }
-                return false;
+
+                continue;
             }
 
             if ($value !== $haystack[$key]) {

src/Creator/AbstractJmsSerializerCreator.php

@@ -30,12 +30,12 @@ abstract class AbstractJmsSerializerCreator implements SerializerCreatorInterfac
     {
         if (
             class_exists(self::BUILDER_CLASS) &&
-            method_exists(self::BUILDER_CLASS, 'create')
+            method_exists(self::BUILDER_CLASS, 'create') // @phpstan-ignore-line
         ) {
             try {
-                $builder = call_user_func([self::BUILDER_CLASS, 'create']);
+                $builder = call_user_func([self::BUILDER_CLASS, 'create']); // @phpstan-ignore-line
 
-                if (null !== $builder && method_exists($builder, 'build')) {
+                if (null !== $builder && method_exists($builder, 'build')) { // @phpstan-ignore-line
                     return new JmsSerializerAdapter($builder->build(), static::getFormat()); // @phpstan-ignore-line
                 }
             } catch (Throwable $throwable) {

src/Creator/AbstractSymfonySerializerCreator.php

@@ -34,7 +34,7 @@ abstract class AbstractSymfonySerializerCreator implements SerializerCreatorInte
             $encoder = static::getEncoderClass();
 
             return new SymfonySerializerAdapter(
-                new $serializer([new $normalizer()], [new $encoder()]),
+                new $serializer([new $normalizer()], [new $encoder()]), // @phpstan-ignore-line
                 static::getFormat()
             );
         }

src/Matchers/BodyMatcher.php

@@ -79,5 +79,7 @@ class BodyMatcher implements RequestMatcherInterface
         if (is_resource($contents)) {
             return static::readAllResource($contents);
         }
+
+        return '';
     }
 }

src/Matchers/FormDataMatcher.php

@@ -10,7 +10,7 @@
 namespace Pock\Matchers;
 
 use Pock\Comparator\ComparatorLocator;
-use Pock\Comparator\RecursiveLtrArrayComparator;
+use Pock\Comparator\RecursiveArrayComparator;
 use Pock\Traits\SeekableStreamDataExtractor;
 use Psr\Http\Message\RequestInterface;
 
@@ -35,6 +35,6 @@ class FormDataMatcher extends QueryMatcher
             return false;
         }
 
-        return ComparatorLocator::get(RecursiveLtrArrayComparator::class)->compare($this->query, $query);
+        return ComparatorLocator::get(RecursiveArrayComparator::class)->compare($this->query, $query);
     }
 }

tests/src/Comparator/RecursiveArrayComparatorTest.php

@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * PHP version 7.3
+ *
+ * @category RecursiveArrayComparatorTest
+ * @package  Pock\Tests\Comparator
+ */
+
+namespace Pock\Tests\Comparator;
+
+use PHPUnit\Framework\TestCase;
+use Pock\Comparator\ComparatorLocator;
+use Pock\Comparator\RecursiveArrayComparator;
+
+/**
+ * Class RecursiveArrayComparatorTest
+ *
+ * @category RecursiveArrayComparatorTest
+ * @package  Pock\Tests\Comparator
+ */
+class RecursiveArrayComparatorTest extends TestCase
+{
+    public function testMatches(): void
+    {
+        $needle = [
+            'filter' => [
+                'createdAtFrom' => '2020-01-01 00:00:00',
+                'createdAtTo' => '2021-08-01 00:00:00',
+            ],
+            'test' => ''
+        ];
+        $haystack = [
+            'filter' => [
+                'createdAtFrom' => '2020-01-01 00:00:00',
+                'createdAtTo' => '2021-08-01 00:00:00',
+            ],
+            'test' => ''
+        ];
+
+        self::assertTrue(ComparatorLocator::get(RecursiveArrayComparator::class)->compare($needle, $haystack));
+    }
+
+    public function testNotMatches(): void
+    {
+        $needle = [
+            'filter' => [
+                'createdAtFrom' => '2020-01-01 00:00:00',
+                'createdAtTo' => '2021-08-01 00:00:00',
+            ],
+            'test2' => [1]
+        ];
+        $haystack = [
+            'filter' => [
+                'createdAtFrom' => '2020-01-01 00:00:00',
+                'createdAtTo' => '2021-08-01 00:00:00',
+            ],
+            'test2' => 1
+        ];
+
+        self::assertFalse(ComparatorLocator::get(RecursiveArrayComparator::class)->compare($needle, $haystack));
+    }
+
+    public function testNotMatchesKeyPositions(): void
+    {
+        $needle = [
+            'source' => json_decode('{"medium":"tiktok","source":"Test Ad","campaign":"Test Campaign"}', true)
+        ];
+        $haystack = [
+            'source' => json_decode('{"source":"Test Ad","medium":"tiktok","campaign":"Test Campaign"}', true)
+        ];
+
+        self::assertTrue(ComparatorLocator::get(RecursiveArrayComparator::class)->compare($needle, $haystack));
+    }
+}

tests/src/Comparator/RecursiveArrayLtrComparatorTest.php

@@ -39,4 +39,37 @@ class RecursiveArrayLtrComparatorTest extends TestCase
 
         self::assertTrue(ComparatorLocator::get(RecursiveLtrArrayComparator::class)->compare($needle, $haystack));
     }
+
+    public function testNotMatches(): void
+    {
+        $needle = [
+            'filter' => [
+                'createdAtFrom' => '2020-01-01 00:00:00',
+                'createdAtTo' => '2021-08-01 00:00:00',
+            ],
+            'test2' => [1]
+        ];
+        $haystack = [
+            'filter' => [
+                'createdAtFrom' => '2020-01-01 00:00:00',
+                'createdAtTo' => '2021-08-01 00:00:00',
+            ],
+            'test2' => 1,
+            'test' => ''
+        ];
+
+        self::assertFalse(ComparatorLocator::get(RecursiveLtrArrayComparator::class)->compare($needle, $haystack));
+    }
+
+    public function testNotMatchesKeyPositions(): void
+    {
+        $needle = [
+            'source' => json_decode('{"medium":"tiktok","source":"Test Ad","campaign":"Test Campaign"}', true)
+        ];
+        $haystack = [
+            'source' => json_decode('{"source":"Test Ad","medium":"tiktok","campaign":"Test Campaign"}', true)
+        ];
+
+        self::assertTrue(ComparatorLocator::get(RecursiveLtrArrayComparator::class)->compare($needle, $haystack));
+    }
 }

tests/src/Matchers/FormDataMatcherTest.php

@@ -44,11 +44,19 @@ class FormDataMatcherTest extends PockTestCase
         self::assertFalse($matcher->matches($request));
     }
 
-    public function testMatches(): void
+    public function testNoMatchesExtraValues(): void
     {
         $matcher = new FormDataMatcher(['field2' => 'value2']);
         $request = self::getRequestWithBody('field1=value1&field2=value2');
 
+        self::assertFalse($matcher->matches($request));
+    }
+
+    public function testMatches(): void
+    {
+        $matcher = new FormDataMatcher(['field1' => 'value1', 'field2' => 'value2']);
+        $request = self::getRequestWithBody('field1=value1&field2=value2');
+
         self::assertTrue($matcher->matches($request));
     }
 }

tests/src/PockBuilderTest.php

@@ -681,7 +681,7 @@ EOF;
         $builder = new PockBuilder();
         $builder->matchMethod(RequestMethod::GET)
             ->matchUri(self::TEST_URI)
-            ->matchFormData(['field2' => 'value2'])
+            ->matchFormData(['field1' => 'value1', 'field2' => 'value2'])
             ->reply(200);
 
         $response = $builder->getClient()->sendRequest(self::getRequestWithBody('field1=value1&field2=value2'));