Skip to content

Commit c859858

Browse files
chore: fix php 8.4 deprecation warning (#169)
1 parent aca44a1 commit c859858

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

Diff for: lib/Client.php

+19-19
Original file line numberDiff line numberDiff line change
@@ -217,22 +217,22 @@ class Client
217217
/**
218218
* Initialize the client.
219219
*
220-
* @param string $host the base url (e.g. https://api.sendgrid.com)
221-
* @param array $headers global request headers
222-
* @param string $version api version (configurable) - this is specific to the SendGrid API
223-
* @param array $path holds the segments of the url path
224-
* @param array $curlOptions extra options to set during curl initialization
225-
* @param bool $retryOnLimit set default retry on limit flag
226-
* @param bool $verifySSLCerts set default verify certificates flag
220+
* @param string $host The base url (e.g. https://api.sendgrid.com)
221+
* @param array $headers Global request headers
222+
* @param string $version Api version (configurable) - this is specific to the SendGrid API
223+
* @param array $path Holds the segments of the url path
224+
* @param array $curlOptions Extra options to set during curl initialization
225+
* @param bool $retryOnLimit Set default retry on limit flag
226+
* @param bool $verifySSLCerts Set default verify certificates flag
227227
*/
228228
public function __construct(
229-
$host,
230-
$headers = null,
231-
$version = null,
232-
$path = null,
233-
$curlOptions = null,
234-
$retryOnLimit = false,
235-
$verifySSLCerts = true
229+
string $host,
230+
?array $headers = null,
231+
?string $version = null,
232+
?array $path = null,
233+
?array $curlOptions = null,
234+
bool $retryOnLimit = false,
235+
bool $verifySSLCerts = true
236236
) {
237237
$this->host = $host;
238238
$this->headers = $headers ?: [];
@@ -263,7 +263,7 @@ public function getHost()
263263
public function setHost(string $host)
264264
{
265265
$this->host = $host;
266-
266+
267267
return $this;
268268
}
269269

@@ -364,7 +364,7 @@ public function setIsConcurrentRequest($isConcurrent)
364364
*
365365
* @return string
366366
*/
367-
private function buildUrl($queryParams = null)
367+
private function buildUrl(?array $queryParams = null)
368368
{
369369
$path = '/' . implode('/', $this->path);
370370
if (isset($queryParams)) {
@@ -385,7 +385,7 @@ private function buildUrl($queryParams = null)
385385
*
386386
* @return array
387387
*/
388-
private function createCurlOptions($method, $body = null, $headers = null)
388+
private function createCurlOptions($method, ?array $body = null, ?array $headers = null)
389389
{
390390
$options = [
391391
CURLOPT_RETURNTRANSFER => true,
@@ -508,7 +508,7 @@ private function retryRequest(array $responseHeaders, $method, $url, $body, $hea
508508
*
509509
* @throws InvalidRequest
510510
*/
511-
public function makeRequest($method, $url, $body = null, $headers = null, $retryOnLimit = false)
511+
public function makeRequest($method, $url, ?array $body = null, ?array $headers = null, $retryOnLimit = false)
512512
{
513513
$channel = curl_init($url);
514514

@@ -604,7 +604,7 @@ public function makeAllRequests(array $requests = [])
604604
*
605605
* @return Client object
606606
*/
607-
public function _($name = null)
607+
public function _(?string $name = null)
608608
{
609609
if (isset($name)) {
610610
$this->path[] = $name;

Diff for: test/unit/MockClient.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class MockClient extends Client
1010
public $requestHeaders;
1111
public $url;
1212

13-
public function makeRequest($method, $url, $requestBody = null, $requestHeaders = null, $retryOnLimit = false)
13+
public function makeRequest($method, $url, ?array $requestBody = null, ?array $requestHeaders = null, $retryOnLimit = false)
1414
{
1515
$this->requestBody = $requestBody;
1616
$this->requestHeaders = $requestHeaders;

0 commit comments

Comments
 (0)