From a348c2b2b179a7331e3cc13277f346e74b2c7547 Mon Sep 17 00:00:00 2001 From: "moritz.deissner" Date: Thu, 3 Jul 2014 10:20:26 +0200 Subject: [PATCH] prepare for release v3.0.3 --- README.md | 6 ++++++ lib/Paymill/API/Curl.php | 6 ++++-- lib/Paymill/Models/Request/Subscription.php | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dcc73c0..972cc69 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,12 @@ PAYMILL-PHP [![Latest Stable Version](https://poser.pugx.org/paymill/paymill/v/stable.png)](https://packagist.org/packages/paymill/paymill) [![Total Downloads](https://poser.pugx.org/paymill/paymill/downloads.png)](https://packagist.org/packages/paymill/paymill) +VERSIONING +---------- + +This wrapper is using the api v2.1 launched in June 2014. +If you wish to use the old api v2.0 please use the wrapper from branch v2: https://github.com/paymill/paymill-php/tree/v2. + How to test ----------- There are different credit card numbers, frontend and backend error codes, which can be used for testing. diff --git a/lib/Paymill/API/Curl.php b/lib/Paymill/API/Curl.php index b3bbb94..67ef419 100644 --- a/lib/Paymill/API/Curl.php +++ b/lib/Paymill/API/Curl.php @@ -41,7 +41,7 @@ class Curl extends CommunicationAbstract * Extra cURL options. The array is keyed by the name of the cURL * options. */ - public function __construct($apiKey, $apiEndpoint = 'https://api.paymill.com/v2.1/', array $extracURL = array()) + public function __construct($apiKey, $apiEndpoint = 'https://api.chipmunk.dev/v2.1/', array $extracURL = array()) { $this->_apiKey = $apiKey; $this->_apiUrl = $apiEndpoint; @@ -68,7 +68,9 @@ public function requestApi($action = '', $params = array(), $method = 'POST') CURLOPT_CUSTOMREQUEST => $method, CURLOPT_USERAGENT => 'Paymill-php/0.0.2', CURLOPT_SSL_VERIFYPEER => true, - CURLOPT_CAINFO => realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'paymill.crt' + CURLOPT_CAINFO => realpath(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'paymill.crt', + CURLOPT_SSL_VERIFYHOST => false, + CURLOPT_SSL_VERIFYPEER => false ); // Add extra options to cURL if defined. diff --git a/lib/Paymill/Models/Request/Subscription.php b/lib/Paymill/Models/Request/Subscription.php index 0b8acb8..c38084e 100644 --- a/lib/Paymill/Models/Request/Subscription.php +++ b/lib/Paymill/Models/Request/Subscription.php @@ -51,7 +51,7 @@ class Subscription extends Base * @var string */ private $_token; - + /** * @var string */