Skip to content

Commit

Permalink
Release 3.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewrowanwallee committed Jun 14, 2024
1 parent 8049c0e commit d9851b3
Show file tree
Hide file tree
Showing 26 changed files with 114 additions and 92 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This repository contains the PostFinance Checkout plugin that enables WooCommerc

## Documentation

* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.0.6/docs/en/documentation.html)
* [Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.0.7/docs/en/documentation.html)

## Support

Expand All @@ -33,4 +33,4 @@ ____________________________________________________________________________

## License

Please see the [license file](https://github.com/pfpayments/woocommerce/blob/3.0.6/LICENSE) for more information.
Please see the [license file](https://github.com/pfpayments/woocommerce/blob/3.0.7/LICENSE) for more information.
7 changes: 7 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -770,3 +770,10 @@ Tested against:
- [Tested Against] Woocommerce 8.9.1
- [Tested Against] PHP SDK 4.2.0

= 3.0.7 - Jun 14 2024 =
- [Feature] Upgraded PHP-SDK to 4.2.1
- [Tested Against] PHP 8.2
- [Tested Against] Wordpress 6.5.3
- [Tested Against] Woocommerce 8.9.1
- [Tested Against] PHP SDK 4.2.0

2 changes: 1 addition & 1 deletion docs/en/documentation.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Documentation</h2> </div>
</a>
</li>
<li>
<a href="https://github.com/pfpayments/woocommerce/releases/tag/3.0.6/">
<a href="https://github.com/pfpayments/woocommerce/releases/tag/3.0.7/">
Source
</a>
</li>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public function get_settings() {
$settings = array(
array(
'links' => array(
'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.0.6/docs/en/documentation.html' => __( 'Documentation', 'woo-postfinancecheckout' ),
'https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.0.7/docs/en/documentation.html' => __( 'Documentation', 'woo-postfinancecheckout' ),
'https://checkout.postfinance.ch/en-ch/user/signup' => __( 'Sign Up', 'woo-postfinancecheckout' ),
),
'type' => 'postfinancecheckout_links',
Expand Down
2 changes: 1 addition & 1 deletion includes/class-wc-postfinancecheckout-migration.php
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public static function check_version() {
public static function plugin_row_meta( $links, $file ) {
if ( WC_POSTFINANCECHECKOUT_PLUGIN_BASENAME === $file ) {
$row_meta = array(
'docs' => '<a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.0.6/docs/en/documentation.html" aria-label="' . esc_attr__( 'View Documentation', 'woo-postfinancecheckout' ) . '">' . esc_html__( 'Documentation', 'woo-postfinancecheckout' ) . '</a>',
'docs' => '<a href="https://plugin-documentation.postfinance-checkout.ch/pfpayments/woocommerce/3.0.7/docs/en/documentation.html" aria-label="' . esc_attr__( 'View Documentation', 'woo-postfinancecheckout' ) . '">' . esc_html__( 'Documentation', 'woo-postfinancecheckout' ) . '</a>',
);

return array_merge( $links, $row_meta );
Expand Down
2 changes: 1 addition & 1 deletion postfinancecheckout-sdk/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "postfinancecheckout/sdk",
"version": "4.2.0",
"version": "4.2.2",
"description": "PostFinance Checkout SDK for PHP",
"keywords": [
"postfinancecheckout",
Expand Down
4 changes: 2 additions & 2 deletions postfinancecheckout-sdk/lib/ApiClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ final class ApiClient {
* @var array
*/
private $defaultHeaders = [
'x-meta-sdk-version' => "4.2.0",
'x-meta-sdk-version' => "4.2.2",
'x-meta-sdk-language' => 'php',
'x-meta-sdk-provider' => "PostFinance Checkout",
];
Expand All @@ -58,7 +58,7 @@ final class ApiClient {
*
* @var string
*/
private $userAgent = 'PHP-Client/4.2.0/php';
private $userAgent = 'PHP-Client/4.2.2/php';

/**
* The path to the certificate authority file.
Expand Down
6 changes: 3 additions & 3 deletions postfinancecheckout-sdk/lib/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class Configuration
*
* @var string
*/
protected $userAgent = 'PostFinanceCheckout\Sdk/4.2.0/php';
protected $userAgent = 'PostFinanceCheckout\Sdk/4.2.2/php';

/**
* Debug switch (default set to false)
Expand Down Expand Up @@ -388,8 +388,8 @@ public static function toDebugReport()
$report = 'PHP SDK (PostFinanceCheckout\Sdk) Debug Report:' . PHP_EOL;
$report .= ' OS: ' . php_uname() . PHP_EOL;
$report .= ' PHP Version: ' . PHP_VERSION . PHP_EOL;
$report .= ' OpenAPI Spec Version: 4.2.0' . PHP_EOL;
$report .= ' SDK Package Version: 4.2.0' . PHP_EOL;
$report .= ' OpenAPI Spec Version: 4.2.2' . PHP_EOL;
$report .= ' SDK Package Version: 4.2.2' . PHP_EOL;
$report .= ' Temp Folder Path: ' . self::getDefaultConfiguration()->getTempFolderPath() . PHP_EOL;

return $report;
Expand Down
24 changes: 2 additions & 22 deletions postfinancecheckout-sdk/lib/Http/CurlHttpClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ public function isSupported() {
public function send(ApiClient $apiClient, HttpRequest $request) {
$curl = curl_init();

$tempCAFile = sys_get_temp_dir() . DIRECTORY_SEPARATOR . "PostFinance Checkout-ca-bundle.crt";

// set timeout, if needed
if ($request->getTimeOut() !== 0) {
curl_setopt($curl, CURLOPT_TIMEOUT, $request->getTimeOut());
Expand All @@ -61,11 +59,6 @@ public function send(ApiClient $apiClient, HttpRequest $request) {
} else {
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 2);
if (file_exists($tempCAFile)) {
// use the temporal CA Bundle if it was set, which indicates a previous error.
$apiClient->setCertificateAuthority($tempCAFile);
curl_setopt($curl, CURLOPT_CAINFO, $apiClient->getCertificateAuthority());
}
}

if ($request->getMethod() === HttpRequest::POST) {
Expand Down Expand Up @@ -109,21 +102,8 @@ public function send(ApiClient $apiClient, HttpRequest $request) {

// Make the request
$response = curl_exec($curl);
if ($response) {
$response = $this->handleResponse($apiClient, $request, $curl, $response, $request->getUrl());
} else {
// if there was an error, try again with the CA bundle provided by this SDK.
if (!file_exists($tempCAFile)) {
$caContent = file_get_contents(__DIR__ . DIRECTORY_SEPARATOR . ".." . DIRECTORY_SEPARATOR . "ca-bundle.crt");
file_put_contents($tempCAFile, $caContent);

// Try again the request, this time with the CA bundle provided by this SDK.
$apiClient->setCertificateAuthority($tempCAFile);
curl_setopt($curl, CURLOPT_CAINFO, $apiClient->getCertificateAuthority());
$response = curl_exec($curl);
$response = $this->handleResponse($apiClient, $request, $curl, $response, $request->getUrl());
}
}

$response = $this->handleResponse($apiClient, $request, $curl, $response, $request->getUrl());

curl_close($curl);
fclose($debugFilePointer);
Expand Down
14 changes: 7 additions & 7 deletions postfinancecheckout-sdk/lib/Model/AnalyticsQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* AnalyticsQuery model
*
* @category Class
* @description Represents a query to be submitted for execution in Analytics.
* @description
* @package PostFinanceCheckout\Sdk
* @author wallee AG
* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License v2
Expand Down Expand Up @@ -259,7 +259,7 @@ public function getAccountId()
/**
* Sets account_id
*
* @param int $account_id The mandatory ID of an account in which the query shall be executed. Must be a valid account ID greater than 0.
* @param int $account_id The ID of the account in which the query is to be executed.
*
* @return $this
*/
Expand All @@ -284,7 +284,7 @@ public function getExternalId()
/**
* Sets external_id
*
* @param string $external_id A client generated nonce which uniquely identifies the query to be executed. Subsequent submissions with the same external ID will not re-execute the query but instead return the existing execution with that ID. Either the External ID or a Maximal Cache Age greater than 0 must be specified. If both are specified the External ID will have precedence and the Maximal Cache Age will be ignored.
* @param string $external_id A client-generated nonce which uniquely identifies some action to be executed. Subsequent requests with the same external ID do not execute the action again, but return the original result.
*
* @return $this
*/
Expand All @@ -309,7 +309,7 @@ public function getMaxCacheAge()
/**
* Sets max_cache_age
*
* @param int $max_cache_age The maximal age in minutes of cached query executions to return. If an equivalent query execution with the same Query String, Account ID and Spaces parameters not older than the specified age is already available that execution will be returned instead of a newly started execution. Set to 0 or null (and set a unique, previously unused External ID) to force a new query execution irrespective of previous executions. Either the External ID or a Cache Duration greater than 0 must be specified. If both are specified, the External ID will be preferred (and the Maximal Cache Age ignored).
* @param int $max_cache_age The maximum age (in minutes) of queries already executed that are to be taken into account. If an equivalent query is already available and not older than the specified age, its result will be returned instead of re-executing it. To force a new execution, specify a new, unique external ID and no maximum cache age.
*
* @return $this
*/
Expand All @@ -334,7 +334,7 @@ public function getQueryString()
/**
* Sets query_string
*
* @param string $query_string The SQL statement which is being submitted for execution. Must be a valid PrestoDB/Athena SQL statement.
* @param string $query_string The PrestoDB/Athena SQL statement to be executed.
*
* @return $this
*/
Expand Down Expand Up @@ -366,7 +366,7 @@ public function getScannedDataLimit()
/**
* Sets scanned_data_limit
*
* @param float $scanned_data_limit The maximal amount of scanned data that this query is allowed to scan. After this limit is reached query will be canceled by the system.
* @param float $scanned_data_limit The maximum amount of data that the query is allowed to scan. After the limit is reached, the query will be canceled.
*
* @return $this
*/
Expand All @@ -391,7 +391,7 @@ public function getSpaceIds()
/**
* Sets space_ids
*
* @param int[] $space_ids The IDs of the spaces in which the query shall be executed. At most 5 space IDs may be specified. All specified spaces must be owned by the account specified by the accountId property. The spaces property may be missing or empty to query all spaces of the specified account.
* @param int[] $space_ids The IDs of the spaces belonging to the specified account in which the query is to be executed. Do not provide any value to query all spaces in the specified account.
*
* @return $this
*/
Expand Down
18 changes: 9 additions & 9 deletions postfinancecheckout-sdk/lib/Model/AnalyticsQueryExecution.php
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public function getAccount()
/**
* Sets account
*
* @param int $account The account in which the query has been executed.
* @param int $account The account in which the query is executed.
*
* @return $this
*/
Expand All @@ -315,7 +315,7 @@ public function getErrorMessage()
/**
* Sets error_message
*
* @param string $error_message The error message if and only if the query has failed, otherwise null.
* @param string $error_message The error message that describes the reason for the failure of the query execution.
*
* @return $this
*/
Expand All @@ -340,7 +340,7 @@ public function getExternalId()
/**
* Sets external_id
*
* @param string $external_id The External ID of the query if one had been specified; otherwise null.
* @param string $external_id The external ID of the query if one was specified, otherwise null.
*
* @return $this
*/
Expand All @@ -365,7 +365,7 @@ public function getFailureReason()
/**
* Sets failure_reason
*
* @param \PostFinanceCheckout\Sdk\Model\FailureReason $failure_reason The reason of the failure if and only if the query has failed, otherwise null.
* @param \PostFinanceCheckout\Sdk\Model\FailureReason $failure_reason The reason for the failure of query execution.
*
* @return $this
*/
Expand Down Expand Up @@ -415,7 +415,7 @@ public function getProcessingEndTime()
/**
* Sets processing_end_time
*
* @param \DateTime $processing_end_time The time at which processing of the query has finished (either successfully or by failure or by cancelation). Will be null if the query execution has not finished yet.
* @param \DateTime $processing_end_time The date and time when the processing of the query was completed. Null if the query execution has not yet been completed.
*
* @return $this
*/
Expand All @@ -440,7 +440,7 @@ public function getProcessingStartTime()
/**
* Sets processing_start_time
*
* @param \DateTime $processing_start_time The time at which processing of the query has started (never null).
* @param \DateTime $processing_start_time The date and time when the processing of the query was started.
*
* @return $this
*/
Expand Down Expand Up @@ -490,7 +490,7 @@ public function getScannedDataInGb()
/**
* Sets scanned_data_in_gb
*
* @param float $scanned_data_in_gb The amount of data scanned while processing the query (in GB). (Note that this amount may increase over time while the query is still being processed and not finished yet.)
* @param float $scanned_data_in_gb The amount of data that was scanned when processing the query (in GB).
*
* @return $this
*/
Expand All @@ -515,7 +515,7 @@ public function getScannedDataLimit()
/**
* Sets scanned_data_limit
*
* @param float $scanned_data_limit The maximal amount of scanned data that this query is allowed to scan. After this limit is reached query will be canceled by the system.
* @param float $scanned_data_limit The maximal amount of data that this query is allowed to scan (in GB). If this limit is reached, the query will be canceled.
*
* @return $this
*/
Expand All @@ -540,7 +540,7 @@ public function getSpaces()
/**
* Sets spaces
*
* @param int[] $spaces The spaces in which the query has been executed. May be empty if all spaces of the specified account have been queried.
* @param int[] $spaces The spaces in which the query is executed. May be empty if all spaces of the specified account have been queried.
*
* @return $this
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ public function getColumns()
/**
* Sets columns
*
* @param \PostFinanceCheckout\Sdk\Model\AnalyticsSchemaColumn[] $columns The schemas of the columns returned by the query (in order). Will be null if the results of the query are not (yet) available.
* @param \PostFinanceCheckout\Sdk\Model\AnalyticsSchemaColumn[] $columns The schemas of the columns returned by the query (in order).
*
* @return $this
*/
Expand All @@ -259,7 +259,7 @@ public function getNextToken()
/**
* Sets next_token
*
* @param string $next_token The token to be provided to fetch the next batch of results. May be null if no more result batches are available.
* @param string $next_token The token to fetch the next batch of results. Null if no more results are available.
*
* @return $this
*/
Expand All @@ -284,7 +284,7 @@ public function getQueryExecution()
/**
* Sets query_execution
*
* @param \PostFinanceCheckout\Sdk\Model\AnalyticsQueryExecution $query_execution The query execution which produced the result.
* @param \PostFinanceCheckout\Sdk\Model\AnalyticsQueryExecution $query_execution The query execution that produced the result.
*
* @return $this
*/
Expand All @@ -309,7 +309,7 @@ public function getRows()
/**
* Sets rows
*
* @param string[][] $rows The rows of the result set contained in this batch where each row is a list of column values (in order of the columns specified in the query). Will be null if the results of the query are not (yet) available.
* @param string[][] $rows The resulting rows contained in this batch where each row is a list of column values.
*
* @return $this
*/
Expand Down
8 changes: 4 additions & 4 deletions postfinancecheckout-sdk/lib/Model/AnalyticsSchemaColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ public function getDescription()
/**
* Sets description
*
* @param map[string,string] $description A human readable description of the property contained in this column or null if this is a synthetic column which is the result of some SQL expression.
* @param map[string,string] $description The localized description of the property contained in this column or null if this is a synthetic column which is the result of some SQL expression.
*
* @return $this
*/
Expand Down Expand Up @@ -362,7 +362,7 @@ public function getReferencedTable()
/**
* Sets referenced_table
*
* @param string $referenced_table The name of the referenced table if this column represents a foreign-key relation to the IDs of another table, otherwise null.
* @param string $referenced_table The name of the referenced table if this column represents a foreign-key relation to another table, otherwise null.
*
* @return $this
*/
Expand All @@ -387,7 +387,7 @@ public function getScale()
/**
* Sets scale
*
* @param int $scale The scale (maximal number number of digits in the fractional part) in case of a decimal data type, otherwise 0.
* @param int $scale The scale (maximal number of digits in the fractional part) in case of a decimal data type, otherwise 0.
*
* @return $this
*/
Expand All @@ -412,7 +412,7 @@ public function getTableName()
/**
* Sets table_name
*
* @param string $table_name The name of the table which defines this column.
* @param string $table_name The name of the table that the column belongs to.
*
* @return $this
*/
Expand Down
6 changes: 3 additions & 3 deletions postfinancecheckout-sdk/lib/Model/AnalyticsSchemaTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ public function getColumns()
/**
* Sets columns
*
* @param \PostFinanceCheckout\Sdk\Model\AnalyticsSchemaColumn[] $columns The schemas of all columns of this table.
* @param \PostFinanceCheckout\Sdk\Model\AnalyticsSchemaColumn[] $columns The schemas of all columns of the table.
*
* @return $this
*/
Expand All @@ -252,7 +252,7 @@ public function getDescription()
/**
* Sets description
*
* @param map[string,string] $description A human readable description of the entity type contained in this table.
* @param map[string,string] $description The localized description of the table.
*
* @return $this
*/
Expand All @@ -277,7 +277,7 @@ public function getTableName()
/**
* Sets table_name
*
* @param string $table_name The name of this table.
* @param string $table_name The name of the table.
*
* @return $this
*/
Expand Down
Loading

0 comments on commit d9851b3

Please sign in to comment.