Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 13 additions & 20 deletions src/Api/Domain.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,43 +43,36 @@ class Domain extends HttpApi
{
private const DKIM_SIZES = ['1024', '2048'];

/**
* Returns a list of domains on the account.
* @param array $params
* @param array $requestHeaders
* @return IndexResponse|array
* @throws ClientExceptionInterface
*/
public function index(array $params = [], array $requestHeaders = [])
public function index(int $limit = 100, int $skip = 0, array $params = [], array $requestHeaders = [])
{
$params = array_merge([
'limit' => 100,
'skip' => 0,
], $params);

if (isset($params['limit'])) {
Assert::range($params['limit'], 1, 1000, 'Limit must be between 1 and 1000');
if ($limit) {
Assert::range($limit, 1, 1000, 'Limit must be between 1 and 1000');
}

if (isset($params['skip'])) {
Assert::greaterThanEq($params['skip'], 0, 'Skip must be non-negative');
if ($skip) {
Assert::greaterThanEq($skip, 0, 'Skip must be non-negative');
}

if (isset($params['state'])) {
Assert::oneOf($params['state'], ['active', 'unverified', 'disabled'],
'State must be one of: active, unverified, disabled');
'State must be one of: active, unverified, disabled');
}

if (isset($params['sort'])) {
Assert::oneOf($params['sort'], ['name', 'name:asc', 'name:desc'],
'Sort must be one of: name, name:asc, name:desc');
}

$params = array_filter($params, function ($value) {
$requestParams = array_merge([
'limit' => $limit,
'skip' => $skip,
], $params);

$requestParams = array_filter($requestParams, function ($value) {
return !is_null($value) && $value !== '';
});

$response = $this->httpGet('/v3/domains', $params, $requestHeaders);
$response = $this->httpGet('/v3/domains', $requestParams, $requestHeaders);

return $this->hydrateResponse($response, IndexResponse::class);
}
Expand Down
27 changes: 15 additions & 12 deletions src/Api/DomainV4.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,24 +43,22 @@ class DomainV4 extends HttpApi
/**
* Returns a list of domains on the account.
* @link https://documentation.mailgun.com/docs/mailgun/api-reference/send/mailgun/domains/get-v4-domains#domains/get-v4-domains/request
* @param int $limit
* @param int $skip
* @param array $params
* @param array $requestHeaders
* @return IndexResponse|array
* @throws ClientExceptionInterface
* @throws \JsonException
*/
public function index(array $params = [], array $requestHeaders = [])
public function index(int $limit = 100, int $skip = 0, array $params = [], array $requestHeaders = [])
{
$params = array_merge([
'limit' => 100,
'skip' => 0,
], $params);

if (isset($params['limit'])) {
Assert::range($params['limit'], 1, 1000, 'Limit must be between 1 and 1000');
if ($limit) {
Assert::range($limit, 1, 1000, 'Limit must be between 1 and 1000');
}

if (isset($params['skip'])) {
Assert::greaterThanEq($params['skip'], 0, 'Skip must be non-negative');
if ($skip) {
Assert::greaterThanEq($skip, 0, 'Skip must be non-negative');
}

if (isset($params['state'])) {
Expand All @@ -73,11 +71,16 @@ public function index(array $params = [], array $requestHeaders = [])
'Sort must be one of: name, name:asc, name:desc');
}

$params = array_filter($params, function ($value) {
$requestParams = array_merge([
'limit' => $limit,
'skip' => $skip,
], $params);

$requestParams = array_filter($requestParams, function ($value) {
return !is_null($value) && $value !== '';
});

$response = $this->httpGet('/v4/domains', $params, $requestHeaders);
$response = $this->httpGet('/v4/domains', $requestParams, $requestHeaders);

return $this->hydrateResponse($response, IndexResponse::class);
}
Expand Down
13 changes: 5 additions & 8 deletions src/Api/Webhook.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,15 @@
*/
class Webhook extends HttpApi
{
/**
* @var string
*/
private string $signingKey;
private ?string $signingKey;

/**
* @param ClientInterface $httpClient
* @param RequestBuilder $requestBuilder
* @param Hydrator $hydrator
* @param string $signingKey
* @param RequestBuilder $requestBuilder
* @param Hydrator $hydrator
* @param string|null $signingKey
*/
public function __construct($httpClient, RequestBuilder $requestBuilder, Hydrator $hydrator, string $signingKey)
public function __construct($httpClient, RequestBuilder $requestBuilder, Hydrator $hydrator, ?string $signingKey)
{
parent::__construct($httpClient, $requestBuilder, $hydrator);
$this->signingKey = $signingKey;
Expand Down
Loading
Loading