Merge pull request #34 from kodbruket/v.1.3.6

Reset curl options before making a new request

Author: indiebytes

Model/Api/Mondido.php

@@ -13,6 +13,8 @@
 
 namespace Mondido\Mondido\Model\Api;
 
+use Psr\Log\LoggerInterface;
+
 /**
  * Abstract Mondido API model
  *
@@ -26,6 +28,18 @@ abstract class Mondido
 {
     protected $_adapter;
 
+    /**
+     * Constructor
+     *
+     * @param Psr\Log\LoggerInterface $logger Logger interface
+     *
+     * @return void
+     */
+    public function __construct(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
     /**
      * Call
      *
@@ -40,6 +54,11 @@ public function call($method, $resource, $params = null, $data = [])
     {
         $url = 'https://api.mondido.com/v1/' . $resource;
 
+        /**
+         * Reset any options potentially set from elsewhere
+         */
+        $this->_adapter->setOptions([]);
+
         if (is_string($params)) {
             $url .= "/$params";
         } else if (is_array($params)) {
@@ -83,6 +102,10 @@ public function call($method, $resource, $params = null, $data = [])
 
         $userPwd = sprintf("%s:%s", $this->_config->getMerchantId(), $this->_config->getPassword());
 
+        $this->logger->debug($method);
+        $this->logger->debug($url);
+        $this->logger->debug(var_export($data, true));
+
         $this->_adapter->addOption(CURLOPT_USERPWD, $userPwd)
             ->addOption(CURLOPT_RETURNTRANSFER, 1)
             ->addOption(CURLOPT_CONNECTTIMEOUT, 30)

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "mondido/magento2-mondido",
     "description": "Mondido payment module for Magento 2.",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "type": "magento2-module",
     "repositories": [
         {

etc/module.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Mondido_Mondido" setup_version="1.3.5">
+    <module name="Mondido_Mondido" setup_version="1.3.6">
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Payment"/>