Merge branch 'arubacao-master'

Nicolas Brosy · Nicolas Brosy · commit b05f60a72246 · 2017-05-30T08:35:58.000+02:00
diff --git a/config/fcm.php b/config/fcm.php
@@ -2,7 +2,7 @@
 
 return [
     'driver' => env('FCM_PROTOCOL', 'http'),
-    'log_enabled' => true,
+    'log_enabled' => false,
 
     'http' => [
         'server_key' => env('FCM_SERVER_KEY', 'Your FCM server key'),
diff --git a/src/Request/BaseRequest.php b/src/Request/BaseRequest.php
@@ -10,7 +10,7 @@ abstract class BaseRequest
     /**
      * @internal
      *
-     * @var \GuzzleHttp\Client
+     * @var \GuzzleHttp\ClientInterface
      */
     protected $client;
 
diff --git a/src/Response/BaseResponse.php b/src/Response/BaseResponse.php
@@ -2,7 +2,7 @@
 
 namespace LaravelFCM\Response;
 
-use GuzzleHttp\Psr7\Response as GuzzleResponse;
+use Psr\Http\Message\ResponseInterface;
 use LaravelFCM\Response\Exceptions\ServerResponseException;
 use LaravelFCM\Response\Exceptions\InvalidRequestException;
 use LaravelFCM\Response\Exceptions\UnauthorizedRequestException;
@@ -25,9 +25,9 @@ abstract class BaseResponse
     /**
      * BaseResponse constructor.
      *
-     * @param GuzzleResponse $response
+     * @param \Psr\Http\Message\ResponseInterface $response
      */
-    public function __construct(GuzzleResponse $response)
+    public function __construct(ResponseInterface $response)
     {
         $this->isJsonResponse($response);
         $this->logEnabled = app('config')->get('fcm.log_enabled', false);
@@ -38,13 +38,13 @@ public function __construct(GuzzleResponse $response)
     /**
      * Check if the response given by fcm is parsable.
      *
-     * @param GuzzleResponse $response
+     * @param \Psr\Http\Message\ResponseInterface $response
      *
      * @throws InvalidRequestException
      * @throws ServerResponseException
      * @throws UnauthorizedRequestException
      */
-    private function isJsonResponse(GuzzleResponse $response)
+    private function isJsonResponse(ResponseInterface $response)
     {
         if ($response->getStatusCode() == 200) {
             return;
diff --git a/src/Response/DownstreamResponse.php b/src/Response/DownstreamResponse.php
@@ -4,7 +4,7 @@
 
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
-use GuzzleHttp\Psr7\Response as GuzzleResponse;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Class DownstreamResponse.
@@ -96,10 +96,10 @@ class DownstreamResponse extends BaseResponse implements DownstreamResponseContr
     /**
      * DownstreamResponse constructor.
      *
-     * @param GuzzleResponse $response
+     * @param \Psr\Http\Message\ResponseInterface $response
      * @param                $tokens
      */
-    public function __construct(GuzzleResponse $response, $tokens)
+    public function __construct(ResponseInterface $response, $tokens)
     {
         $this->tokens = is_string($tokens) ? [$tokens] : $tokens;
 
diff --git a/src/Response/Exceptions/InvalidRequestException.php b/src/Response/Exceptions/InvalidRequestException.php
@@ -3,7 +3,7 @@
 namespace LaravelFCM\Response\Exceptions;
 
 use Exception;
-use GuzzleHttp\Psr7\Response as GuzzleResponse;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Class InvalidRequestException.
@@ -13,9 +13,9 @@ class InvalidRequestException extends Exception
     /**
      * InvalidRequestException constructor.
      *
-     * @param GuzzleResponse $response
+     * @param \Psr\Http\Message\ResponseInterface $response
      */
-    public function __construct(GuzzleResponse $response)
+    public function __construct(ResponseInterface $response)
     {
         $code = $response->getStatusCode();
         $responseBody = $response->getBody()->getContents();
diff --git a/src/Response/Exceptions/ServerResponseException.php b/src/Response/Exceptions/ServerResponseException.php
@@ -3,7 +3,7 @@
 namespace LaravelFCM\Response\Exceptions;
 
 use Exception;
-use GuzzleHttp\Psr7\Response as GuzzleResponse;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Class ServerResponseException.
@@ -20,9 +20,9 @@ class ServerResponseException extends Exception
     /**
      * ServerResponseException constructor.
      *
-     * @param GuzzleResponse $response
+     * @param \Psr\Http\Message\ResponseInterface $response
      */
-    public function __construct(GuzzleResponse $response)
+    public function __construct(ResponseInterface $response)
     {
         $code = $response->getStatusCode();
         $responseHeader = $response->getHeaders();
diff --git a/src/Response/Exceptions/UnauthorizedRequestException.php b/src/Response/Exceptions/UnauthorizedRequestException.php
@@ -3,7 +3,7 @@
 namespace LaravelFCM\Response\Exceptions;
 
 use Exception;
-use GuzzleHttp\Psr7\Response as GuzzleResponse;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Class UnauthorizedRequestException.
@@ -13,9 +13,9 @@ class UnauthorizedRequestException extends Exception
     /**
      * UnauthorizedRequestException constructor.
      *
-     * @param GuzzleResponse $response
+     * @param \Psr\Http\Message\ResponseInterface $response
      */
-    public function __construct(GuzzleResponse $response)
+    public function __construct(ResponseInterface $response)
     {
         $code = $response->getStatusCode();
 
diff --git a/src/Response/GroupResponse.php b/src/Response/GroupResponse.php
@@ -4,7 +4,7 @@
 
 use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
-use GuzzleHttp\Psr7\Response as GuzzleResponse;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Class GroupResponse.
@@ -44,10 +44,10 @@ class GroupResponse extends BaseResponse implements GroupResponseContract
     /**
      * GroupResponse constructor.
      *
-     * @param GuzzleResponse $response
+     * @param \Psr\Http\Message\ResponseInterface $response
      * @param                $to
      */
-    public function __construct(GuzzleResponse $response, $to)
+    public function __construct(ResponseInterface $response, $to)
     {
         $this->to = $to;
         parent::__construct($response);
diff --git a/src/Response/TopicResponse.php b/src/Response/TopicResponse.php
@@ -5,7 +5,7 @@
 use Monolog\Logger;
 use LaravelFCM\Message\Topics;
 use Monolog\Handler\StreamHandler;
-use GuzzleHttp\Psr7\Response as GuzzleResponse;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Class TopicResponse.
@@ -45,10 +45,10 @@ class TopicResponse extends BaseResponse implements TopicResponseContract
     /**
      * TopicResponse constructor.
      *
-     * @param GuzzleResponse $response
+     * @param \Psr\Http\Message\ResponseInterface $response
      * @param Topics         $topic
      */
-    public function __construct(GuzzleResponse $response, Topics $topic)
+    public function __construct(ResponseInterface $response, Topics $topic)
     {
         $this->topic = $topic;
         parent::__construct($response);
diff --git a/src/Sender/FCMGroup.php b/src/Sender/FCMGroup.php
@@ -3,7 +3,7 @@
 namespace LaravelFCM\Sender;
 
 use LaravelFCM\Request\GroupRequest;
-use GuzzleHttp\Psr7\Response as GuzzleResponse;
+use Psr\Http\Message\ResponseInterface;
 
 /**
  * Class FCMGroup.
@@ -19,12 +19,14 @@ class FCMGroup extends HTTPSender
      *
      * @param       $notificationKeyName
      * @param array $registrationIds
+     *
+     * @return null|string notification_key
      */
     public function createGroup($notificationKeyName, array $registrationIds)
     {
         $request = new GroupRequest(self::CREATE, $notificationKeyName, null, $registrationIds);
 
-        $response = $this->client->post($this->url, $request->build());
+        $response = $this->client->request('post', $this->url, $request->build());
 
         return $this->getNotificationToken($response);
     }
@@ -35,11 +37,12 @@ public function createGroup($notificationKeyName, array $registrationIds)
      * @param       $notificationKeyName
      * @param       $notificationKey
      * @param array $registrationIds     registrationIds to add
+     * @return null|string notification_key
      */
     public function addToGroup($notificationKeyName, $notificationKey, array $registrationIds)
     {
         $request = new GroupRequest(self::ADD, $notificationKeyName, $notificationKey, $registrationIds);
-        $response = $this->client->post($this->url, $request->build());
+        $response = $this->client->request('post', $this->url, $request->build());
 
         return $this->getNotificationToken($response);
     }
@@ -52,40 +55,40 @@ public function addToGroup($notificationKeyName, $notificationKey, array $regist
      * @param       $notificationKeyName
      * @param       $notificationKey
      * @param array $registeredIds       registrationIds to remove
+     * @return null|string notification_key
      */
     public function removeFromGroup($notificationKeyName, $notificationKey, array $registeredIds)
     {
         $request = new GroupRequest(self::REMOVE, $notificationKeyName, $notificationKey, $registeredIds);
-        $response = $this->client->post($this->url, $request->build());
+        $response = $this->client->request('post', $this->url, $request->build());
 
         return $this->getNotificationToken($response);
     }
 
     /**
      * @internal
      *
-     * @param GuzzleResponse $response
+     * @param \Psr\Http\Message\ResponseInterface $response
+     * @return null|string notification_key
      */
-    private function getNotificationToken(GuzzleResponse $response)
+    private function getNotificationToken(ResponseInterface $response)
     {
-        if ($this->isValidResponse($response)) {
+        if (! $this->isValidResponse($response)) {
             return null;
         }
 
-        $json = json_decode($response->getBody(), true);
+        $json = json_decode($response->getBody()->getContents(), true);
 
         return $json['notification_key'];
     }
 
     /**
-     * @internal
-     *
-     * @param $response
+     * @param \Psr\Http\Message\ResponseInterface $response
      *
      * @return bool
      */
-    public function isValidResponse(GuzzleResponse $response)
+    public function isValidResponse(ResponseInterface $response)
     {
-        return $response->getReasonPhrase() != 'OK' || $response->getStatusCode() != 200;
+        return $response->getStatusCode() === 200;
     }
 }
diff --git a/src/Sender/FCMSender.php b/src/Sender/FCMSender.php
@@ -101,14 +101,14 @@ public function sendToTopic(Topics $topics, Options $options = null, PayloadNoti
     /**
      * @internal
      *
-     * @param $request
+     * @param \LaravelFCM\Request\Request $request
      *
      * @return null|\Psr\Http\Message\ResponseInterface
      */
     private function post($request)
     {
         try {
-            $responseGuzzle = $this->client->post($this->url, $request->build());
+            $responseGuzzle = $this->client->request('post', $this->url, $request->build());
         } catch (ClientException $e) {
             $responseGuzzle = $e->getResponse();
         }
diff --git a/src/Sender/HTTPSender.php b/src/Sender/HTTPSender.php
@@ -12,7 +12,7 @@ abstract class HTTPSender
     /**
      * The client used to send messages.
      *
-     * @var GuzzleHttp\ClientInterface
+     * @var \GuzzleHttp\ClientInterface
      */
     protected $client;
 
@@ -26,7 +26,7 @@ abstract class HTTPSender
     /**
      * Initializes a new sender object.
      *
-     * @param GuzzleHttp\ClientInterface $client
+     * @param \GuzzleHttp\ClientInterface $client
      * @param string                     $url
      */
     public function __construct(ClientInterface $client, $url)
diff --git a/tests/DownstreamTest.php b/tests/DownstreamTest.php
@@ -22,7 +22,7 @@ public function it_send_a_notification_to_a_device()
 					}');
 
         $client = Mockery::mock(Client::class);
-        $client->shouldReceive('post')->once()->andReturn($response);
+        $client->shouldReceive('request')->once()->andReturn($response);
 
         $tokens = 'uniqueToken';
 
@@ -51,7 +51,7 @@ public function it_send_a_notification_to_more_than_1000_devices()
 					}');
 
         $client = Mockery::mock(Client::class);
-        $client->shouldReceive('post')->times(10)->andReturn($response);
+        $client->shouldReceive('request')->times(10)->andReturn($response);
 
         $tokens = [];
         for ($i = 0; $i < 10000; ++$i) {
@@ -83,7 +83,7 @@ public function an_empty_array_of_tokens_thrown_an_exception()
 					}');
 
         $client = Mockery::mock(Client::class);
-        $client->shouldReceive('post')->once()->andReturn($response);
+        $client->shouldReceive('request')->once()->andReturn($response);
 
         $fcm = new FCMSender($client, 'http://test.test');
         $this->setExpectedException(\LaravelFCM\Response\Exceptions\InvalidRequestException::class);
diff --git a/tests/TopicsTest.php b/tests/TopicsTest.php
@@ -111,7 +111,7 @@ public function it_send_a_notification_to_a_topic()
         $response = new Response(200, [], '{"message_id":6177433633397011933}');
 
         $client = Mockery::mock(Client::class);
-        $client->shouldReceive('post')->once()->andReturn($response);
+        $client->shouldReceive('request')->once()->andReturn($response);
 
         $fcm = new FCMSender($client, 'http://test.test');
 
@@ -133,7 +133,7 @@ public function it_send_a_notification_to_a_topic_and_return_error()
         $response = new Response(200, [], '{"error":"TopicsMessageRateExceeded"}');
 
         $client = Mockery::mock(Client::class);
-        $client->shouldReceive('post')->once()->andReturn($response);
+        $client->shouldReceive('request')->once()->andReturn($response);
 
         $fcm = new FCMSender($client, 'http://test.test');
 
diff --git a/tests/mocks/MockDownstreamResponse.php b/tests/mocks/MockDownstreamResponse.php
diff --git a/tests/mocks/MockGroupResponse.php b/tests/mocks/MockGroupResponse.php
diff --git a/tests/mocks/MockTopicResponse.php b/tests/mocks/MockTopicResponse.php

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ abstract class BaseRequest`
`10`	`10`	`/**`
`11`	`11`	`* @internal`
`12`	`12`	`*`
`13`		`- * @var \GuzzleHttp\Client`
	`13`	`+ * @var \GuzzleHttp\ClientInterface`
`14`	`14`	`*/`
`15`	`15`	`protected $client;`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace LaravelFCM\Sender;`
`4`	`4`
`5`	`5`	`use LaravelFCM\Request\GroupRequest;`
`6`		`-use GuzzleHttp\Psr7\Response as GuzzleResponse;`
	`6`	`+use Psr\Http\Message\ResponseInterface;`
`7`	`7`
`8`	`8`	`/**`
`9`	`9`	`* Class FCMGroup.`
`@@ -19,12 +19,14 @@ class FCMGroup extends HTTPSender`
`19`	`19`	`*`
`20`	`20`	`* @param $notificationKeyName`
`21`	`21`	`* @param array $registrationIds`
	`22`	`+ *`
	`23`	`+ * @return null\|string notification_key`
`22`	`24`	`*/`
`23`	`25`	`public function createGroup($notificationKeyName, array $registrationIds)`
`24`	`26`	`{`
`25`	`27`	`$request = new GroupRequest(self::CREATE, $notificationKeyName, null, $registrationIds);`
`26`	`28`
`27`		`- $response = $this->client->post($this->url, $request->build());`
	`29`	`+ $response = $this->client->request('post', $this->url, $request->build());`
`28`	`30`
`29`	`31`	`return $this->getNotificationToken($response);`
`30`	`32`	`}`
`@@ -35,11 +37,12 @@ public function createGroup($notificationKeyName, array $registrationIds)`
`35`	`37`	`* @param $notificationKeyName`
`36`	`38`	`* @param $notificationKey`
`37`	`39`	`* @param array $registrationIds registrationIds to add`
	`40`	`+ * @return null\|string notification_key`
`38`	`41`	`*/`
`39`	`42`	`public function addToGroup($notificationKeyName, $notificationKey, array $registrationIds)`
`40`	`43`	`{`
`41`	`44`	`$request = new GroupRequest(self::ADD, $notificationKeyName, $notificationKey, $registrationIds);`
`42`		`- $response = $this->client->post($this->url, $request->build());`
	`45`	`+ $response = $this->client->request('post', $this->url, $request->build());`
`43`	`46`
`44`	`47`	`return $this->getNotificationToken($response);`
`45`	`48`	`}`
`@@ -52,40 +55,40 @@ public function addToGroup($notificationKeyName, $notificationKey, array $regist`
`52`	`55`	`* @param $notificationKeyName`
`53`	`56`	`* @param $notificationKey`
`54`	`57`	`* @param array $registeredIds registrationIds to remove`
	`58`	`+ * @return null\|string notification_key`
`55`	`59`	`*/`
`56`	`60`	`public function removeFromGroup($notificationKeyName, $notificationKey, array $registeredIds)`
`57`	`61`	`{`
`58`	`62`	`$request = new GroupRequest(self::REMOVE, $notificationKeyName, $notificationKey, $registeredIds);`
`59`		`- $response = $this->client->post($this->url, $request->build());`
	`63`	`+ $response = $this->client->request('post', $this->url, $request->build());`
`60`	`64`
`61`	`65`	`return $this->getNotificationToken($response);`
`62`	`66`	`}`
`63`	`67`
`64`	`68`	`/**`
`65`	`69`	`* @internal`
`66`	`70`	`*`
`67`		`- * @param GuzzleResponse $response`
	`71`	`+ * @param \Psr\Http\Message\ResponseInterface $response`
	`72`	`+ * @return null\|string notification_key`
`68`	`73`	`*/`
`69`		`- private function getNotificationToken(GuzzleResponse $response)`
	`74`	`+ private function getNotificationToken(ResponseInterface $response)`
`70`	`75`	`{`
`71`		`- if ($this->isValidResponse($response)) {`
	`76`	`+ if (! $this->isValidResponse($response)) {`
`72`	`77`	`return null;`
`73`	`78`	`}`
`74`	`79`
`75`		`- $json = json_decode($response->getBody(), true);`
	`80`	`+ $json = json_decode($response->getBody()->getContents(), true);`
`76`	`81`
`77`	`82`	`return $json['notification_key'];`
`78`	`83`	`}`
`79`	`84`
`80`	`85`	`/**`
`81`		`- * @internal`
`82`		`- *`
`83`		`- * @param $response`
	`86`	`+ * @param \Psr\Http\Message\ResponseInterface $response`
`84`	`87`	`*`
`85`	`88`	`* @return bool`
`86`	`89`	`*/`
`87`		`- public function isValidResponse(GuzzleResponse $response)`
	`90`	`+ public function isValidResponse(ResponseInterface $response)`
`88`	`91`	`{`
`89`		`- return $response->getReasonPhrase() != 'OK' \|\| $response->getStatusCode() != 200;`
	`92`	`+ return $response->getStatusCode() === 200;`
`90`	`93`	`}`
`91`	`94`	`}`