Remove dependence on Magento Framework Curl (#10)

kustomer · Jun 18, 2018 · f0bc1ba · f0bc1ba
1 parent 321f6eb
commit f0bc1ba
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 31 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alexcheng/magento2:2.2.2-integrator
+FROM alexcheng/magento2:2.1-developer
 
 ADD . app/code/Kustomer/KustomerIntegration
 

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,9 @@
 ### Kustomer Integration for Magento Update History
 
+#### 1.1.3
+
+- Remove use of `\Magento\Framework\HTTP\Client\Curl`
+
 #### 1.1.2
 
 - Minor internal changes that should have no functional impact

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -13,7 +13,6 @@
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
 use Magento\Store\Model\Store;
 use Magento\Store\Model\ScopeInterface;
-use Magento\Framework\HTTP\Client\Curl;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Store\Model\StoreManagerInterface;
 
@@ -35,24 +34,21 @@ class Data extends AbstractHelper
     public $storeManagerInterface;
     public $quoteRepository;
     public $pricingHelper;
-    public $curl;
     public $logger;
 
     public function __construct(
         Context $context,
         StoreManagerInterface $storeManagerInterface,
         CustomerRepositoryInterface $customerRepository,
         QuoteRepository $quoteRepository,
-        PricingHelper $pricingHelper,
-        Curl $curl
+        PricingHelper $pricingHelper
     )
     {
         parent::__construct($context);
         $this->quoteRepository = $quoteRepository;
         $this->pricingHelper = $pricingHelper;
         $this->storeManagerInterface = $storeManagerInterface;
         $this->customerRepository = $customerRepository;
-        $this->curl = $curl;
         $this->logger = $context->getLogger();
     }
 
@@ -350,25 +346,37 @@ public function request($uri, $body = null, $store = null)
     {
         $authToken = $this->getKustomerApiKey($store);
         $headers = array(
-            'Authorization' => 'Bearer '.$authToken,
-            'User-Agent' => self::USER_AGENT.self::VERSION,
-            'Accept' => self::ACCEPT_HEADER,
-            'Content-Type' => self::CONTENT_TYPE,
+            'Authorization: Bearer '.$authToken,
+            'User-Agent: '.self::USER_AGENT.self::VERSION,
+            'Accept: '.self::ACCEPT_HEADER,
+            'Content-Type: '.self::CONTENT_TYPE,
         );
 
-        $this->curl->setHeaders($headers);
-        try {
-            $this->curl->post($uri, $body);
-        } catch (\Exception $e) {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $uri);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_VERBOSE, 1);
+        curl_setopt($ch, CURLOPT_HEADER, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_TIMEOUT_MS, 3000);
+
+        // $this->curl->setHeaders($headers);
+        $res = curl_exec($ch);
+        $e = curl_error($ch);
+        $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
+        $bodyMessage = substr($res, $header_size);
+
+        if ($e)
+        {
             return [
-              'success' => false,
-              'error' => $e->getCode().': '.$e->getMessage()
+                'success' => false,
+                'error' => $e,
             ];
         }
 
-        $statusCode = $this->curl->getStatus();
-        $bodyMessage = $this->curl->getBody();
-
         if ($statusCode >= 400)
         {
             return [

diff --git a/Test/Unit/Helper/DataTest.php b/Test/Unit/Helper/DataTest.php
@@ -39,11 +39,6 @@ class DataTest extends \PHPUnit\Framework\TestCase
      */
     protected $pricingHelper;
 
-    /**
-     * @var \Magento\Framework\HTTP\Client\Curl | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $curl;
-
     /**
      * @var \Psr\Log\LoggerInterface | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -74,10 +69,6 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $this->curl = $this->getMockBuilder(\Magento\Framework\HTTP\Client\Curl::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
         $this->logger = $this->getMockBuilder(\Psr\Log\LoggerInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -88,7 +79,6 @@ protected function setUp()
             $this->customerRepository,
             $this->quoteRepository,
             $this->pricingHelper,
-            $this->curl,
             $this->logger
         );
     }

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "kustomer/kustomer-integration",
   "description": "Integrate Magento eCommerce site with Kustomer service",
   "type": "magento2-module",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

diff --git a/etc/module.xml b/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="Kustomer_KustomerIntegration" setup_version="1.1.2">
+    <module name="Kustomer_KustomerIntegration" setup_version="1.1.3">
         <sequence>
             <module name="Magento_Store"/>
         </sequence>