Skip to content

Commit

Permalink
Merge pull request #90 from paynl/feature/PLUG-3725
Browse files Browse the repository at this point in the history
PLUG-3725 - Updating CURL
  • Loading branch information
woutse authored Aug 20, 2024
2 parents 72dd7c7 + e6e63f7 commit 5fcb001
Show file tree
Hide file tree
Showing 19 changed files with 2,553 additions and 1,262 deletions.
46 changes: 32 additions & 14 deletions paynlpaymentmethods/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion paynlpaymentmethods/paynlpaymentmethods.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class PaynlPaymentMethods extends PaymentModule
private $statusCanceled;
private $paymentMethods;
private $payLogEnabled;
private int $is_eu_compatible;
private array $fields_form;

/**
* Constructor.
Expand All @@ -65,7 +67,7 @@ public function __construct()
{
$this->name = 'paynlpaymentmethods';
$this->tab = 'payments_gateways';
$this->version = '4.17.2';
$this->version = '4.17.3';
$this->payLogEnabled = null;
$this->ps_versions_compliancy = array('min' => '1.7', 'max' => _PS_VERSION_);
$this->author = 'PAY.';
Expand Down
29 changes: 21 additions & 8 deletions paynlpaymentmethods/vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,32 +53,37 @@
},
{
"name": "php-curl-class/php-curl-class",
"version": "8.5.0",
"version_normalized": "8.5.0.0",
"version": "9.19.2",
"version_normalized": "9.19.2.0",
"source": {
"type": "git",
"url": "https://github.com/php-curl-class/php-curl-class.git",
"reference": "2b387e3ef1c8a1d6116a1459c0e3e71643f86806"
"reference": "c41efeb4ea2dc3cf8f90f8f967b0fcf45a41e294"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-curl-class/php-curl-class/zipball/2b387e3ef1c8a1d6116a1459c0e3e71643f86806",
"reference": "2b387e3ef1c8a1d6116a1459c0e3e71643f86806",
"url": "https://api.github.com/repos/php-curl-class/php-curl-class/zipball/c41efeb4ea2dc3cf8f90f8f967b0fcf45a41e294",
"reference": "c41efeb4ea2dc3cf8f90f8f967b0fcf45a41e294",
"shasum": ""
},
"require": {
"ext-curl": "*",
"php": ">=5.3"
"php": ">=7.0"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "*",
"ext-gd": "*",
"friendsofphp/php-cs-fixer": "*",
"phpcompatibility/php-compatibility": "dev-develop",
"phpcsstandards/phpcsutils": "@alpha",
"phpunit/phpunit": "*",
"squizlabs/php_codesniffer": "*"
"squizlabs/php_codesniffer": "*",
"vimeo/psalm": ">=0.3.63"
},
"suggest": {
"ext-mbstring": "*"
},
"time": "2019-01-07T06:43:45+00:00",
"time": "2024-04-09T18:03:13+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand All @@ -93,6 +98,10 @@
"authors": [
{
"name": "Zach Borboa"
},
{
"name": "Contributors",
"homepage": "https://github.com/php-curl-class/php-curl-class/graphs/contributors"
}
],
"description": "PHP Curl Class makes it easy to send HTTP requests and integrate with web APIs.",
Expand All @@ -119,6 +128,10 @@
"web-service",
"xml"
],
"support": {
"issues": "https://github.com/php-curl-class/php-curl-class/issues",
"source": "https://github.com/php-curl-class/php-curl-class/tree/9.19.2"
},
"install-path": "../php-curl-class/php-curl-class"
}
],
Expand Down
18 changes: 9 additions & 9 deletions paynlpaymentmethods/vendor/composer/installed.php
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?php return array(
'root' => array(
'name' => 'paynl/paynlpaymentmethods',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '2ea4f7686143fcff725a9296fdb2b55b6d956cfe',
'pretty_version' => '1.0.0+no-version-set',
'version' => '1.0.0.0',
'reference' => NULL,
'type' => 'prestashop-module',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
'dev' => true,
),
'versions' => array(
'paynl/paynlpaymentmethods' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
'reference' => '2ea4f7686143fcff725a9296fdb2b55b6d956cfe',
'pretty_version' => '1.0.0+no-version-set',
'version' => '1.0.0.0',
'reference' => NULL,
'type' => 'prestashop-module',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -29,9 +29,9 @@
'dev_requirement' => false,
),
'php-curl-class/php-curl-class' => array(
'pretty_version' => '8.5.0',
'version' => '8.5.0.0',
'reference' => '2b387e3ef1c8a1d6116a1459c0e3e71643f86806',
'pretty_version' => '9.19.2',
'version' => '9.19.2.0',
'reference' => 'c41efeb4ea2dc3cf8f90f8f967b0fcf45a41e294',
'type' => 'library',
'install_path' => __DIR__ . '/../php-curl-class/php-curl-class',
'aliases' => array(),
Expand Down
4 changes: 2 additions & 2 deletions paynlpaymentmethods/vendor/composer/platform_check.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

$issues = array();

if (!(PHP_VERSION_ID >= 50302)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 5.3.2". You are running ' . PHP_VERSION . '.';
if (!(PHP_VERSION_ID >= 70000)) {
$issues[] = 'Your Composer dependencies require a PHP version ">= 7.0.0". You are running ' . PHP_VERSION . '.';
}

if ($issues) {
Expand Down
Loading

0 comments on commit 5fcb001

Please sign in to comment.