Merge pull request #2 from adrorocker/develop

Merge Develop into Master

Author: adrorocker

.coveralls.yml

@@ -0,0 +1,2 @@
+coverage_clover: build/logs/clover.xml
+json_path: build/logs/coveralls-upload.json

.travis.yml

@@ -19,5 +19,11 @@ before_script:
 
   - wget http://getcomposer.org/composer.phar
   - php composer.phar install
+  - php composer.phar require satooshi/php-coveralls
 
-script: phpunit --bootstrap tests/bootstrap.php tests
+script:
+  - mkdir -p build/logs
+  - phpunit -c phpunit.xml.dist
+
+after_script:
+  - travis_retry php vendor/bin/coveralls -v

README.md

@@ -4,6 +4,7 @@
 A PHP SDK for Firebase REST API.
 
 [![Build status][Master image]][Master]
+[![Coverage Status][Master covarage image]][Master covarage]
 
 -----------------------------------
 
@@ -47,4 +48,6 @@ $get = $firebase->get('/logs')->getResponse();
 [Alejandro Morelos](https://github.com/adrorocker). 
 
   [Master]: https://travis-ci.org/adrorocker/php-firebase/
-  [Master image]: https://travis-ci.org/adrorocker/php-firebase.svg?branch=master
+  [Master image]: https://travis-ci.org/adrorocker/php-firebase.svg?branch=master&style=flat-square
+  [Master covarage]: https://coveralls.io/github/adrorocker/php-firebase?branch=master
+  [Master covarage image]: https://coveralls.io/repos/github/adrorocker/php-firebase/badge.svg?branch=master&style=flat-square

phpunit.xml.dist

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="./tests/bootstrap.php">
+    <php>
+        <ini name="error_reporting" value="E_ALL" />
+    </php>
+
+    <testsuites>
+        <testsuite name="PHP Firebase test suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory>./src</directory>
+            <exclude>
+                <directory>./build</directory>
+                <directory>./composer</directory>
+                <directory>./tests</directory>
+                <directory>./vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
+</phpunit>

tests/Clients/FakeClient.php

@@ -45,48 +45,44 @@ public function __construct()
 
     public function get($endpoint, $query = [])
     {
-        $request = new Request('GET',$this->buildUri($endpoint), $this->buildHeaders());
-
-        $response = $this->guzzle->send($request);
+        $response = $this->guzzle->request('GET',$endpoint);
 
         return $this->handle($response);
     }
 
     public function post($endpoint, $data, $query = [])
     {
+        $response = $this->guzzle->request('POST',$endpoint);
 
+        return $this->handle($response);
     }
 
     public function put($endpoint, $data, $query = [])
     {
+        $response = $this->guzzle->request('PUT',$endpoint);
 
+        return $this->handle($response);
     }
 
     public function patch($endpoint, $data, $query = [])
     {
+        $response = $this->guzzle->request('PATCH',$endpoint);
 
+        return $this->handle($response);
     }
 
     public function delete($endpoint, $query = [])
     {
+        $response = $this->guzzle->request('DELETE',$endpoint);
 
+        return $this->handle($response);
     }
 
     protected function buildUri($endpoint, $options = [], $query = [])
     {
         return 'http://example.com/' . ltrim($endpoint, '/') . '.json?' . http_build_query($options, '', '&');
     }
 
-    protected function buildHeaders($extraHeaders = [])
-    {
-        $headers = [
-            'Accept' => 'application/json',
-            'Content-Type: application/json',
-        ];
-
-        return array_merge($headers, $extraHeaders);
-    }
-
     private function handle(Response $response, $default = null)
     {
         $stream = stream_for($response->getBody());

tests/FirebaseTest.php

@@ -41,6 +41,18 @@ public function testFirebaseClient()
         $response = $me->getResponse();
 
         $this->assertNull($response);
+
+        $response = $me->post('/',['key'=>'value'])->getResponse();
+
+        $this->assertNull($response);
+
+        $response = $me->put('/',['key'=>'value'])->getResponse();
+
+        $this->assertNull($response);
+
+        $response = $me->patch('/',['key'=>'value'])->getResponse();
+
+        $this->assertNull($response);
     }
 
     public function testBaseException()