deblan
/
matrix-php-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix misspellings and deprecations in HTTP API class

This commit is contained in:
Brad Jones 2021-05-31 14:25:34 -10:00 committed by Aryess
parent 9b8591d1f3
commit 8d5f95ed38
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/MatrixHttpApi.php
View File

@ -8,6 +8,7 @@ use Aryess\PhpMatrixSdk\Exceptions\MatrixRequestException;
use Aryess\PhpMatrixSdk\Exceptions\ValidationException;
use GuzzleHttp\Client;
use GuzzleHttp\Exception\GuzzleException;
use GuzzleHttp\RequestOptions;
/**
* Contains all raw Matrix HTTP Client-Server API calls.
@ -63,7 +64,7 @@ class MatrixHttpApi {
/**
* @var bool
*/
private $vallidateCert;
private $validateCert;
/**
* @var Client
@ -94,7 +95,7 @@ class MatrixHttpApi {
$this->token = $token;
$this->identity = $identity;
$this->txnId = 0;
$this->vallidateCert = true;
$this->validateCert = true;
$this->client = new Client();
$this->default429WaitMs = $default429WaitMs;
$this->useAuthorizationHeader = $useAuthorizationHeader;
@ -139,7 +140,7 @@ class MatrixHttpApi {
}
public function validateCertificate(bool $validity) {
$this->vallidateCert = $validity;
$this->validateCert = $validity;
}
/**
@ -925,18 +926,20 @@ class MatrixHttpApi {
$queryParams['user_id'] = $this->identity;
}
$endpoint = $this->baseUrl . $apiPath . $path;
if ($headers['Content-Type'] == "application/json" && $content != null) {
$content = json_encode($content);
}
$options = array_merge($options, [
'headers' => $headers,
'query' => $queryParams,
'body' => $content,
'verify' => $this->vallidateCert,
'verify' => $this->validateCert,
]);
$endpoint = $this->baseUrl . $apiPath . $path;
if ($headers['Content-Type'] == "application/json" && $content !== null) {
$options[RequestOptions::JSON] = $content;
}
else {
$options[RequestOptions::FORM_PARAMS] = $content;
}
$responseBody = '';
while (true) {
try {
@ -1449,4 +1452,4 @@ class MatrixHttpApi {
}
}
}