From 5a92b28b5f3091b8975cedfd337843f2ca4f4bf9 Mon Sep 17 00:00:00 2001 From: Neur0toxine Date: Mon, 4 Apr 2022 16:24:30 +0300 Subject: [PATCH] phpstan baseline & better tests for the port matcher --- phpstan-baseline.neon | 132 +++++++++++++++++++++++++ phpstan.neon | 3 + tests/src/Matchers/PortMatcherTest.php | 29 +++++- 3 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 phpstan-baseline.neon diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon new file mode 100644 index 0000000..4f22194 --- /dev/null +++ b/phpstan-baseline.neon @@ -0,0 +1,132 @@ +parameters: + ignoreErrors: + - + message: "#^Method Pock\\\\Client\\:\\:doSendRequest\\(\\) should return Psr\\\\Http\\\\Message\\\\ResponseInterface but returns mixed\\.$#" + 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\\\\) does not accept array\\\\.$#" + count: 1 + path: src/Comparator/ComparatorLocator.php + + - + message: "#^Unsafe access to private property Pock\\\\Comparator\\\\ComparatorLocator\\:\\:\\$comparators through static\\:\\:\\.$#" + 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\\, array\\ 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 + path: src/Factory/JsonSerializerFactory.php + + - + message: "#^Unsafe access to private property Pock\\\\Factory\\\\XmlSerializerFactory\\:\\:\\$mainSerializer through static\\:\\:\\.$#" + count: 2 + path: src/Factory/XmlSerializerFactory.php + + - + message: "#^Method Pock\\\\Matchers\\\\CallbackRequestMatcher\\:\\:matches\\(\\) should return bool but returns mixed\\.$#" + count: 1 + path: src/Matchers/CallbackRequestMatcher.php + + - + message: "#^Unsafe call to private method Pock\\\\Matchers\\\\ExactHeadersMatcher\\:\\:headerValuesEqual\\(\\) through static\\:\\:\\.$#" + count: 2 + path: src/Matchers/ExactHeadersMatcher.php + + - + message: "#^Method Pock\\\\Matchers\\\\JsonBodyMatcher\\:\\:deserialize\\(\\) should return array\\|null but returns mixed\\.$#" + count: 1 + path: src/Matchers/JsonBodyMatcher.php + + - + message: "#^Parameter \\#3 \\$depth of function json_decode expects int\\<1, max\\>, int given\\.$#" + count: 1 + path: src/Matchers/JsonBodyMatcher.php + + - + message: "#^Method Pock\\\\Matchers\\\\MultipartFormDataMatcher\\:\\:matches\\(\\) should return bool but returns mixed\\.$#" + count: 1 + path: src/Matchers/MultipartFormDataMatcher.php + + - + message: "#^Method Pock\\\\Matchers\\\\XmlBodyMatcher\\:\\:sortXmlTags\\(\\) should return string but returns string\\|null\\.$#" + count: 1 + path: src/Matchers/XmlBodyMatcher.php + + - + message: "#^Unsafe access to private constant Pock\\\\Matchers\\\\XmlBodyMatcher\\:\\:TAG_SORT_XSLT through static\\:\\:\\.$#" + count: 1 + path: src/Matchers/XmlBodyMatcher.php + + - + message: "#^Unsafe access to private property Pock\\\\Matchers\\\\XmlBodyMatcher\\:\\:\\$sorter through static\\:\\:\\.$#" + count: 4 + path: src/Matchers/XmlBodyMatcher.php + + - + message: "#^Unsafe call to private method Pock\\\\Matchers\\\\XmlBodyMatcher\\:\\:createDOMDocument\\(\\) through static\\:\\:\\.$#" + count: 2 + path: src/Matchers/XmlBodyMatcher.php + + - + message: "#^Unsafe call to private method Pock\\\\Matchers\\\\XmlBodyMatcher\\:\\:getDOMString\\(\\) through static\\:\\:\\.$#" + count: 1 + path: src/Matchers/XmlBodyMatcher.php + + - + message: "#^Unsafe call to private method Pock\\\\Matchers\\\\XmlBodyMatcher\\:\\:getSorter\\(\\) through static\\:\\:\\.$#" + count: 1 + path: src/Matchers/XmlBodyMatcher.php + + - + message: "#^Unsafe call to private method Pock\\\\Matchers\\\\XmlBodyMatcher\\:\\:hasExtension\\(\\) through static\\:\\:\\.$#" + count: 4 + path: src/Matchers/XmlBodyMatcher.php + + - + message: "#^Unsafe call to private method Pock\\\\Matchers\\\\XmlBodyMatcher\\:\\:sortXmlTags\\(\\) through static\\:\\:\\.$#" + count: 2 + path: src/Matchers/XmlBodyMatcher.php + + - + message: "#^Parameter \\#1 \\$data of class Pock\\\\Matchers\\\\JsonBodyMatcher constructor expects array, mixed given\\.$#" + count: 2 + path: src/PockBuilder.php + + - + message: "#^Parameter \\#3 \\$depth of function json_decode expects int\\<1, max\\>, int given\\.$#" + count: 1 + path: src/PockBuilder.php + + - + message: "#^Parameter \\#3 \\$depth of function json_encode expects int\\<1, max\\>, int given\\.$#" + count: 1 + path: src/PockBuilder.php + + - + message: "#^Parameter \\#3 \\$depth of function json_encode expects int\\<1, max\\>, int given\\.$#" + count: 1 + path: src/PockResponseBuilder.php + diff --git a/phpstan.neon b/phpstan.neon index 1494f51..d622979 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,3 +1,6 @@ +includes: + - phpstan-baseline.neon # TODO: Configure new phpstan + parameters: level: max paths: diff --git a/tests/src/Matchers/PortMatcherTest.php b/tests/src/Matchers/PortMatcherTest.php index 0f6c813..4563a25 100644 --- a/tests/src/Matchers/PortMatcherTest.php +++ b/tests/src/Matchers/PortMatcherTest.php @@ -9,7 +9,8 @@ namespace Pock\Tests\Matchers; -use Pock\Matchers\HostMatcher; +use Nyholm\Psr7\Uri; +use Pock\Enum\RequestScheme; use Pock\Matchers\PortMatcher; use Pock\TestUtils\PockTestCase; @@ -30,4 +31,30 @@ class PortMatcherTest extends PockTestCase { self::assertTrue((new PortMatcher(443))->matches(static::getTestRequest())); } + + public function testMatchesWithoutProto(): void + { + self::assertTrue((new PortMatcher(80))->matches(static::getTestRequest()->withUri(new class extends Uri { + public function getScheme(): string + { + return RequestScheme::HTTP; + } + + public function getPort(): ?int + { + return null; + } + }))); + self::assertTrue((new PortMatcher(443))->matches(static::getTestRequest()->withUri(new class extends Uri { + public function getScheme(): string + { + return RequestScheme::HTTPS; + } + + public function getPort(): ?int + { + return null; + } + }))); + } }