Update http client

Author: DomasWEB

composer.json

@@ -5,25 +5,16 @@
     "license": "MIT",
     "keywords": ["mailerlite", "sdk", "email", "marketing"],
     "type": "library",
-    "authors": [
-        {
-            "name": "Justinas Pošiūnas",
-            "email": "justinas.posiunas@mailerlite.com",
-            "homepage": "https://mailerlite.com",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php" : "^5.5|^7.0",
-        "guzzlehttp/psr7": "~1.2",
-        "php-http/httplug": "^1.0",
-        "php-http/curl-client": "^1.4",
-        "php-http/message": "^1.2"
+        "require": {
+        "php" : "^7.1",
+        "php-http/client-common": "^2.0",
+        "php-http/discovery": "^1.7",
+        "nyholm/psr7": "^1.0",
+        "ext-json": "*"
     },
     "require-dev": {
-        "php-http/guzzle6-adapter": "^1.0",
-        "phpunit/phpunit": "5.3.*",
-        "mockery/mockery": "^0.9.4"
+        "php-http/guzzle6-adapter": "^2.0",
+        "phpunit/phpunit": "6.*"
     },
     "autoload": {
         "psr-4": {

src/Common/RestClient.php

@@ -3,14 +3,12 @@
 namespace MailerLiteApi\Common;
 
 use Http\Client\HttpClient;
-use Http\Client\Curl\Client as CurlClient;
-
-use GuzzleHttp\Psr7\Request;
-use MailerLiteApi\Common\ApiConstants;
+use Http\Discovery\Psr17FactoryDiscovery;
+use Http\Discovery\Psr18ClientDiscovery;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
-
-use Http\Message\MessageFactory\GuzzleMessageFactory;
-use Http\Message\StreamFactory\GuzzleStreamFactory;
+use Psr\Http\Message\StreamFactoryInterface;
 
 class RestClient {
 
@@ -20,10 +18,14 @@ class RestClient {
 
     public $baseUrl;
 
+    public $requestFactory;
+
+    public $streamFactory;
+
     /**
-     * @param string $baseUrl
-     * @param string $apiKey
-     * @param HttpClient $httpClient
+     * @param  string  $baseUrl
+     * @param  string  $apiKey
+     * @param  \Http\Client\HttpClient|null  $httpClient
      */
     public function __construct($baseUrl, $apiKey, HttpClient $httpClient = null)
     {
@@ -90,11 +92,25 @@ public function delete($endpointUri)
      */
     protected function send($method, $endpointUri, $body = null, array $headers = [])
     {
+
         $headers = array_merge($headers, self::getDefaultHeaders());
         $endpointUrl = $this->baseUrl . $endpointUri;
 
-        $request = new Request($method, $endpointUrl, $headers, json_encode($body));
-        $response = $this->getHttpClient()->sendRequest($request);
+        $request = $this->getRequestFactory()->createRequest($method, $endpointUrl);
+
+        if ($body) {
+            $stream  = $this->getStreamFactory()
+                            ->createStream(json_encode($body));
+            $request = $request->withBody($stream);
+        }
+
+        foreach ($headers as $name => $value) {
+            $request = $request->withAddedHeader($name, $value);
+        }
+
+        $response = $this->getHttpClient()->sendRequest(
+            $request
+        );
 
         return $this->handleResponse($response);
     }
@@ -117,30 +133,52 @@ protected function handleResponse(ResponseInterface $response)
     }
 
     /**
-     * @return HttpClient
+     * @return ClientInterface
      */
     protected function getHttpClient()
     {
         if (is_null($this->httpClient)) {
-            $options = [
-                CURLOPT_CONNECTTIMEOUT => 10,
-                CURLOPT_SSL_VERIFYPEER => false
-            ];
-
-            $this->httpClient = new CurlClient(new GuzzleMessageFactory(), new GuzzleStreamFactory(), $options);
+            $this->httpClient = Psr18ClientDiscovery::find();
         }
 
         return $this->httpClient;
     }
 
+    /**
+     * @return HttpClient
+     */
+    protected function getRequestFactory(): RequestFactoryInterface
+    {
+        if (null === $this->requestFactory) {
+            $this->requestFactory = Psr17FactoryDiscovery::findRequestFactory();
+        }
+
+        return $this->requestFactory;
+    }
+
+    private function getStreamFactory(): StreamFactoryInterface
+    {
+        if (null === $this->streamFactory) {
+            $this->streamFactory = Psr17FactoryDiscovery::findStreamFactory();
+        }
+
+        return $this->streamFactory;
+    }
+
     /**
      * @return array
      */
     protected function getDefaultHeaders() {
-        return [
-            'User-Agent'          => ApiConstants::SDK_USER_AGENT . '/' . ApiConstants::SDK_VERSION,
-            'X-MailerLite-ApiKey' => $this->apiKey,
-            'Content-Type'        => 'application/json'
+        $headers = [
+            'User-Agent'          => ApiConstants::SDK_USER_AGENT.'/'.ApiConstants::SDK_VERSION,
+            'Content-Type'        => 'application/json',
         ];
+
+        // Only adding it when provided. Not required for RestClientTest
+        if ($this->apiKey) {
+            $headers['X-MailerLite-ApiKey'] = $this->apiKey;
+        }
+
+        return $headers;
     }
-}
+}

tests/GroupsTest.php

@@ -85,7 +85,7 @@ public function check_groups_count()
     {
         $groupsCount = $this->groupsApi->count();
 
-        $this->assertTrue(array_key_exists('count', $groupsCount) && is_numeric($groupsCount->count));
+        $this->assertTrue(isset($groupsCount->count) && is_numeric($groupsCount->count));
     }
 
     /** @test **/
@@ -130,4 +130,4 @@ public function import_subscribers()
         $this->assertTrue( ! empty($addedSubscribers));
     }
 
-}
+}

tests/MailerLiteTest.php

@@ -9,8 +9,8 @@ class MailerLiteTest extends MlTestCase
     /** @test **/
     public function invalid_api_key()
     {
-        $this->setExpectedException('\\MailerLiteApi\\Exceptions\\MailerLiteSdkException');
+        $this->expectException('\\MailerLiteApi\\Exceptions\\MailerLiteSdkException');
 
         $ml = new MailerLite();
     }
-}
+}

tests/MlTestCase.php

@@ -2,11 +2,13 @@
 
 namespace MailerLiteApi\Tests;
 
-use MailerLiteApi\MailerLite;
 use MailerLiteApi\Api\Groups;
 
-class MlTestCase extends \PHPUnit_Framework_TestCase
+class MlTestCase extends \PHPUnit\Framework\TestCase
 {
+    /** @var Groups */
+    protected $groupsApi;
+
     // helper functions
     protected function createGroup($name = 'New Group')
     {
@@ -40,12 +42,12 @@ protected function addSubscribers($groupId, $count = 5)
 
     protected function assertContainsValue($list, $key, $value)
     {
-        return $this->assertTrue($this->containsValue($list, $key, $value));
+        $this->assertTrue($this->containsValue($list, $key, $value));
     }
 
     protected function assertDoesNotContainValue($list, $key, $value)
     {
-        return $this->assertFalse($this->containsValue($list, $key, $value));
+        $this->assertFalse($this->containsValue($list, $key, $value));
     }
 
     protected function containsValue($list, $key, $value)
@@ -62,4 +64,4 @@ protected function containsValue($list, $key, $value)
         return $found;
     }
 
-}
+}

tests/RestClientTest.php

@@ -70,22 +70,22 @@ public function delete_method()
     {
         $response = $this->client->delete('delete');
 
-        $this->assertEquals('null', $response['body']->data);
+        $this->assertEquals('', $response['body']->data);
     }
 
     /** @test **/
     public function error_internal_server()
     {
-        $this->setExpectedException('Exception');
+        $this->expectException('Exception');
 
-        $response = $this->client->get('status/500');
+        $this->client->get('status/500');
     }
 
     /** @test **/
     public function error_400()
     {
-        $this->setExpectedException('Exception');
+        $this->expectException('Exception');
 
-        $response = $this->client->get('status/400');
+        $this->client->get('status/400');
     }
-}
+}