Skip to content

Commit 46e3ea6

Browse files
committed
Merge branch 'master' of github.com:Jhut89/Mailchimp-API-3.0-PHP into lock_update
2 parents 2a61a3c + 7655f40 commit 46e3ea6

File tree

6 files changed

+17
-10
lines changed

6 files changed

+17
-10
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ sudo: required
22
dist: trusty
33
language: php
44
php:
5-
- '5.6'
6-
- '7.0'
5+
- '7.2'
76
before-script:
87
- composer install
98
- composer update

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
},
2222
"homepage": "https://github.com/Jhut89/Mailchimp-API-3.0-PHP",
2323
"require-dev": {
24+
"php": ">=7.2.0",
2425
"phpunit/phpunit": "^5",
2526
"squizlabs/php_codesniffer": "3.*"
2627
}

src/Requests/MailchimpConnection.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,13 @@ private function setHandlerOptionsForMethod()
179179

180180
/**
181181
* Executes a connection with the current request and settings
182+
*
183+
* @param bool $close close this connection after execution
184+
*
182185
* @return MailchimpResponse
183186
* @throws MailchimpException
184187
*/
185-
public function execute()
188+
public function execute($close = true)
186189
{
187190
$this->response = $this->executeCurl();
188191
if (!$this->response) {
@@ -197,6 +200,10 @@ public function execute()
197200
strlen($this->response)
198201
);
199202

203+
if ($close) {
204+
$this->close();
205+
}
206+
200207
if ($this->isSuccess()) {
201208
return new SuccessResponse(
202209
$this->headers,

src/Requests/MailchimpRequest.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,8 +451,12 @@ public function reset()
451451
$apikey = $this->apikey;
452452
$request_vars = get_object_vars($this);
453453
foreach ($request_vars as $key => $value) {
454+
if (in_array($key, ['success_callback', 'failure_callback'], true)) {
455+
continue;
456+
}
457+
454458
$this->$key = null;
455-
if ($key == 'headers') {
459+
if ('headers' === $key) {
456460
$this->$key = [];
457461
}
458462
}

src/Responses/FailureResponse.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?php
22

3-
43
namespace MailchimpAPI\Responses;
54

6-
75
/**
86
* Class FailureResponse
97
* @package MailchimpAPI\Responses
@@ -23,7 +21,7 @@ public function __construct($headers, $body, $http_code, callable $failure_callb
2321
parent::__construct($headers, $body, $http_code);
2422

2523
if ($failure_callback) {
26-
call_user_func($failure_callback);
24+
call_user_func($failure_callback, $this);
2725
}
2826
}
2927
}

src/Responses/SuccessResponse.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?php
22

3-
43
namespace MailchimpAPI\Responses;
54

6-
75
/**
86
* Class SuccessResponse
97
* @package MailchimpAPI\Responses
@@ -23,7 +21,7 @@ public function __construct($headers, $body, $http_code, callable $success_callb
2321
parent::__construct($headers, $body, $http_code);
2422

2523
if ($success_callback) {
26-
call_user_func($success_callback);
24+
call_user_func($success_callback, $this);
2725
}
2826
}
2927
}

0 commit comments

Comments
 (0)