Merge pull request #8 from databox/update-dependencies

Update dependencies

Author: VladaPetrovic

.travis.yml

@@ -3,7 +3,6 @@ language: php
 sudo: false
 
 php:
-  - 5.4
   - 5.5
   - 5.6
   - 7.0

README.md

@@ -12,7 +12,7 @@ The PHP SDK for interacting with the [Databox](http://databox.com) Push API.
 
 ## Requirements
 
-* PHP >= 5.4 with [cURL](http://php.net/manual/en/book.curl.php) extension,
+* PHP >= 5.5.0 with [cURL](http://php.net/manual/en/book.curl.php) extension,
 * [Guzzle](https://github.com/guzzle/guzzle) library,
 * (optional) [PHPUnit](https://phpunit.de/) to run tests.
 
@@ -34,7 +34,7 @@ Use autoloader from Composer by:
 ```json
 {
     "require": {
-        "databox/databox-php": "@stable"
+        "databox/databox": "@stable"
     }
 }
 ```

composer.json

@@ -1,38 +1,40 @@
 {
-  "name": "databox/databox-php",
-  "description": "Databox bindings for PHP",
+  "name": "databox/databox",
   "type": "library",
+  "description": "Official PHP client for Databox",
+  "keywords": ["databox", "sdk", "client"],
+  "homepage": "http://github.com/databox/databox-php",
+  "license": "MIT",
   "authors": [
     {
       "name": "Jakob Murko",
-      "email": "jakob@databox.com",
-      "homepage": "http://databox.com"
+      "email": "jakob.murko@gmail.com",
+      "homepage": "https://github.com/sraka1"
     },
     {
       "name": "Uros Majeric",
-      "email": "uros@majeric.si"
+      "email": "uros@majeric.si",
+      "homepage": "https://github.com/umajeric"
     },
     {
       "name": "Oto Brglez",
-      "email": "otobrglez@gmail.com"
+      "email": "otobrglez@gmail.com",
+      "homepage": "https://github.com/otobrglez"
     },
     {
       "name": "Vlada Petrovic",
-      "email": "vlada.petrovic@gmail.com"
+      "email": "vlada.petrovic@gmail.com",
+      "homepage": "https://github.com/vladapetrovic"
     }
   ],
-  "homepage": "http://github.com/databox/databox-php",
-  "license": [
-    "MIT"
-  ],
   "require": {
-    "guzzlehttp/guzzle": "5.x",
-    "php": ">=5.4"
+    "guzzlehttp/guzzle": "^6.1",
+    "php": ">=5.5.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.x",
-    "phpdocumentor/phpdocumentor": "2.*",
-    "codeclimate/php-test-reporter": "dev-master"
+    "phpunit/phpunit": "^4",
+    "phpdocumentor/phpdocumentor": "^2.8",
+    "codeclimate/php-test-reporter": "^0.2.0"
   },
   "autoload": {
     "psr-4": {

example.php

@@ -13,8 +13,7 @@
 
 $c->insertAll([
     ['sales', 203],
-    ['sales', 103, '2015-01-01 17:00:00'],
-
+    ['sales', 103, '2015-01-01 17:00:00']
 ]);
 
 print_r(

src/Databox/Client.php

@@ -9,19 +9,19 @@ class Client extends GuzzleClient
     public function __construct($pushToken = null)
     {
         parent::__construct([
-            'base_url' => 'https://push2new.databox.com',
-            'defaults' => [
-                'headers' => [
-                    'Content-Type' => 'application/json'
-                ],
-                'auth' => [$pushToken, '', 'Basic']
+            'base_uri' => 'https://push2new.databox.com',
+            'headers'  => [
+                'User-Agent'   => 'databox-php/1.2',
+                'Content-Type' => 'application/json',
+                'Accept'       => 'application/json'
             ],
+            'auth' => [$pushToken, '', 'Basic']
         ]);
     }
 
     public function rawPush($path = '/', $data = [])
     {
-        return $this->post($path, $data)->json();
+        return json_decode($this->post($path, $data)->getBody(), true);
     }
 
     private function processKPI($key, $value, $date = null, $attributes = null)

tests/Databox/Tests/ClientTest.php

@@ -3,8 +3,7 @@
 namespace Databox\Tests;
 
 use Databox\Client;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Stream\Stream;
+use GuzzleHttp\Psr7\Response;
 
 class ClientTest extends \PHPUnit_Framework_TestCase
 {
@@ -17,14 +16,17 @@ public function __construct()
 
     public function testClientCorrectOptions()
     {
-        $contentType = 'application/json';
-        $token       = 'test-token';
-        $baseUrl     = 'https://push2new.databox.com';
+        $mimeType  = 'application/json';
+        $userAgent = 'databox-php';
+        $token     = 'test-token';
+        $baseUrl   = 'https://push2new.databox.com';
 
         $client = new Client($token);
-        $this->assertEquals($contentType, $client->getDefaultOption('headers/Content-Type'));
-        $this->assertEquals($token, $client->getDefaultOption('auth/0'));
-        $this->assertEquals($baseUrl, $client->getBaseUrl());
+        $this->assertEquals($mimeType, $client->getConfig('headers')['Content-Type']);
+        $this->assertEquals($userAgent, substr($client->getConfig('headers')['User-Agent'], 0, 11));
+        $this->assertEquals($mimeType, $client->getConfig('headers')['Accept']);
+        $this->assertEquals($baseUrl, (string) $client->getConfig('base_uri'));
+        $this->assertEquals($token, $client->getConfig('auth')[0]);
     }
 
     public function testRawPush()
@@ -34,7 +36,7 @@ public function testRawPush()
             ->getMock();
 
         $json     = '{"status":"ok"}';
-        $response = new Response(200, [], Stream::factory($json));
+        $response = new Response(200, [], $json);
         $client->method('post')->willReturn($response);
 
         $this->assertEquals($json, json_encode($client->rawPush()));