Skip to content

Commit ec16152

Browse files
Release 4.2.2
1 parent 6e3ee63 commit ec16152

File tree

5 files changed

+9
-27
lines changed

5 files changed

+9
-27
lines changed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "postfinancecheckout/sdk",
3-
"version": "4.2.1",
3+
"version": "4.2.2",
44
"description": "PostFinance Checkout SDK for PHP",
55
"keywords": [
66
"postfinancecheckout",

lib/ApiClient.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ final class ApiClient {
4848
* @var array
4949
*/
5050
private $defaultHeaders = [
51-
'x-meta-sdk-version' => "4.2.1",
51+
'x-meta-sdk-version' => "4.2.2",
5252
'x-meta-sdk-language' => 'php',
5353
'x-meta-sdk-provider' => "PostFinance Checkout",
5454
];
@@ -58,7 +58,7 @@ final class ApiClient {
5858
*
5959
* @var string
6060
*/
61-
private $userAgent = 'PHP-Client/4.2.1/php';
61+
private $userAgent = 'PHP-Client/4.2.2/php';
6262

6363
/**
6464
* The path to the certificate authority file.

lib/Configuration.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class Configuration
8080
*
8181
* @var string
8282
*/
83-
protected $userAgent = 'PostFinanceCheckout\Sdk/4.2.1/php';
83+
protected $userAgent = 'PostFinanceCheckout\Sdk/4.2.2/php';
8484

8585
/**
8686
* Debug switch (default set to false)
@@ -388,8 +388,8 @@ public static function toDebugReport()
388388
$report = 'PHP SDK (PostFinanceCheckout\Sdk) Debug Report:' . PHP_EOL;
389389
$report .= ' OS: ' . php_uname() . PHP_EOL;
390390
$report .= ' PHP Version: ' . PHP_VERSION . PHP_EOL;
391-
$report .= ' OpenAPI Spec Version: 4.2.1' . PHP_EOL;
392-
$report .= ' SDK Package Version: 4.2.1' . PHP_EOL;
391+
$report .= ' OpenAPI Spec Version: 4.2.2' . PHP_EOL;
392+
$report .= ' SDK Package Version: 4.2.2' . PHP_EOL;
393393
$report .= ' Temp Folder Path: ' . self::getDefaultConfiguration()->getTempFolderPath() . PHP_EOL;
394394

395395
return $report;

lib/Http/CurlHttpClient.php

+2-20
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ public function isSupported() {
4040
public function send(ApiClient $apiClient, HttpRequest $request) {
4141
$curl = curl_init();
4242

43-
$tempCAFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . "PostFinance Checkout-ca-bundle.crt";
44-
4543
// set timeout, if needed
4644
if ($request->getTimeOut() !== 0) {
4745
curl_setopt($curl, CURLOPT_TIMEOUT, $request->getTimeOut());
@@ -61,11 +59,6 @@ public function send(ApiClient $apiClient, HttpRequest $request) {
6159
} else {
6260
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
6361
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
64-
if (file_exists($tempCAFile)) {
65-
// use the temporal CA Bundle if it was set, which indicates a previous error.
66-
$apiClient->setCertificateAuthority($tempCAFile);
67-
curl_setopt($curl, CURLOPT_CAINFO, $apiClient->getCertificateAuthority());
68-
}
6962
}
7063

7164
if ($request->getMethod() === HttpRequest::POST) {
@@ -109,19 +102,8 @@ public function send(ApiClient $apiClient, HttpRequest $request) {
109102

110103
// Make the request
111104
$response = curl_exec($curl);
112-
if ($response) {
113-
$response = $this->handleResponse($apiClient, $request, $curl, $response, $request->getUrl());
114-
} else {
115-
// if there was an error, try again with the CA bundle provided by this SDK.
116-
$caContent = file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . ".." . DIRECTORY_SEPARATOR . "ca-bundle.crt");
117-
file_put_contents($tempCAFile, $caContent);
118-
119-
// Try again the request, this time with the CA bundle provided by this SDK.
120-
$apiClient->setCertificateAuthority($tempCAFile);
121-
curl_setopt($curl, CURLOPT_CAINFO, $apiClient->getCertificateAuthority());
122-
$response = curl_exec($curl);
123-
$response = $this->handleResponse($apiClient, $request, $curl, $response, $request->getUrl());
124-
}
105+
106+
$response = $this->handleResponse($apiClient, $request, $curl, $response, $request->getUrl());
125107

126108
curl_close($curl);
127109
fclose($debugFilePointer);

test/ApiClientTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public function testSdkHeaders()
144144
$this->assertGreaterThanOrEqual(4, count($headers));
145145

146146
// Check SDK default header values.
147-
$this->assertEquals($headers['x-meta-sdk-version'], "4.2.1");
147+
$this->assertEquals($headers['x-meta-sdk-version'], "4.2.2");
148148
$this->assertEquals($headers['x-meta-sdk-language'], 'php');
149149
$this->assertEquals($headers['x-meta-sdk-provider'], "PostFinance Checkout");
150150
$this->assertEquals($headers['x-meta-sdk-language-version'], phpversion());

0 commit comments

Comments
 (0)