Skip to content

Allow request pattern instance #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jurigag wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow request pattern instance #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 37 additions & 12 deletions src/WireMock/Client/WireMock.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use DateTime;
use WireMock\Fault\DelayDistribution;
use WireMock\Fault\GlobalDelaySettings;
use WireMock\Matching\RequestPattern;
use WireMock\Matching\UrlMatchingStrategy;
use WireMock\PostServe\WebhookDefinition;
use WireMock\Recording\RecordingStatusResult;
Expand Down Expand Up @@ -96,12 +97,12 @@ public function importStubs($stubImportsOrBuilder)
}

/**
* @param RequestPatternBuilder|CountMatchingStrategy|integer $requestPatternBuilderOrCount
* @param RequestPatternBuilder|null $requestPatternBuilder
* @param RequestPatternBuilder|RequestPattern|CountMatchingStrategy|integer $requestPatternBuilderOrCount
* @param RequestPatternBuilder|RequestPattern|null $requestPatternBuilder
* @throws ClientException
* @throws VerificationException
*/
public function verify($requestPatternBuilderOrCount, ?RequestPatternBuilder $requestPatternBuilder = null)
public function verify($requestPatternBuilderOrCount, $requestPatternBuilder = null)
{
if ($requestPatternBuilderOrCount instanceof CountMatchingStrategy) {
$patternBuilder = $requestPatternBuilder;
Expand All @@ -114,7 +115,8 @@ public function verify($requestPatternBuilderOrCount, ?RequestPatternBuilder $re
$numberOfRequestsMatcher = null;
}

$requestPattern = $patternBuilder->build();
$requestPattern = $this->requestPattern($patternBuilder);

$response = $this->doPost('__admin/requests/count', $requestPattern, CountMatchingRequestsResult::class);
$count = $response->getCount();

Expand Down Expand Up @@ -161,12 +163,12 @@ public function getAllServeEvents($sinceOrQuery = null, $limit = null)
}

/**
* @param RequestPatternBuilder $requestPatternBuilder
* @param RequestPatternBuilder|RequestPattern $requestPatternBuilder
* @return LoggedRequest[]
*/
public function findAll(RequestPatternBuilder $requestPatternBuilder)
public function findAll($requestPatternBuilder)
{
$requestPattern = $requestPatternBuilder->build();
$requestPattern = $this->requestPattern($requestPatternBuilder);
$result = $this->doPost('__admin/requests/find', $requestPattern, FindRequestsResult::class);
return $result->getRequests();
}
Expand All @@ -180,16 +182,16 @@ public function findUnmatchedRequests()
}

/**
* @param LoggedRequest|RequestPatternBuilder $loggedRequestOrPattern
* @param LoggedRequest|RequestPatternBuilder|RequestPattern $loggedRequestOrPattern
* @return FindNearMissesResult
* @throws \Exception
*/
public function findNearMissesFor($loggedRequestOrPattern)
{
if ($loggedRequestOrPattern instanceof LoggedRequest) {
$path = '__admin/near-misses/request';
} else if ($loggedRequestOrPattern instanceof RequestPatternBuilder) {
$loggedRequestOrPattern = $loggedRequestOrPattern->build();
} else if ($loggedRequestOrPattern instanceof RequestPatternBuilder || $loggedRequestOrPattern instanceof RequestPattern) {
$loggedRequestOrPattern = $this->requestPattern($loggedRequestOrPattern);
$path = '__admin/near-misses/request-pattern';
} else {
throw new \Exception('Unexpected near miss specifier: ' . print_r($loggedRequestOrPattern, true));
Expand Down Expand Up @@ -225,11 +227,11 @@ public function removeServeEvent($id)
}

/**
* @param RequestPatternBuilder $requestPatternBuilder
* @param RequestPatternBuilder|RequestPattern $requestPatternBuilder
*/
public function removeServeEvents($requestPatternBuilder)
{
$this->doPost('__admin/requests/remove', $requestPatternBuilder->build());
$this->doPost('__admin/requests/remove', $this->requestPattern($requestPatternBuilder));
}

/**
Expand Down Expand Up @@ -1210,4 +1212,27 @@ public static function webhook(): WebhookDefinition
{
return new WebhookDefinition();
}

/**
* @param RequestPatternBuilder|RequestPattern $patternBuilder
*/
private function requestPattern($patternBuilder): RequestPattern
{
if ($patternBuilder instanceof RequestPatternBuilder) {
return $patternBuilder->build();
}

if ($patternBuilder instanceof RequestPattern) {
return $patternBuilder;
}

throw new \InvalidArgumentException(
sprintf(
'Expected %s or %s, got: %s',
RequestPatternBuilder::class,
RequestPattern::class,
is_object($patternBuilder) ? get_class($patternBuilder) : gettype($patternBuilder)
)
);
}
}