Merge 17305d5 into 64b2846

lib/Botamp/Api/ApiRequestor.php

@@ -34,7 +34,7 @@ public function send($action, $params = [])
             case 'all':
                 return $this->httpClient->get($this->serializeUrl($params));
             case 'get':
-                return $this->httpClient->get($this->url."/{$params['id']}");
+                return $this->httpClient->get($this->url.( $params['id'] !== null ? '/'.$params['id'] : ''));
             case 'create':
                 return $this->httpClient->post($this->url, [], $this->serializeBody($params));
             case 'update':

lib/Botamp/Api/ApiResource.php

@@ -26,7 +26,7 @@ public function all(array $params = [])
         return new BotampObject(ApiResponse::getContent($response), $this);
     }
 
-    public function get($id)
+    public function get($id = null)
     {
         $response = $this->apiRequestor->send('get', ['id' => $id]);
         return new BotampObject(ApiResponse::getContent($response), $this);

lib/Botamp/Client.php

@@ -3,7 +3,6 @@
 namespace Botamp;
 
 use Botamp\Api\ApiResource;
-use Botamp\Api\Me;
 use Botamp\Api\ApiResponse;
 use Botamp\Exceptions;
 use Http\Client\Common;
@@ -35,6 +34,8 @@ class Client
 
     public $me;
 
+    public $subscriptions;
+
     public function __construct($apiKey, HttpClient $httpClient = null)
     {
         $this->apiKey = $apiKey;
@@ -95,6 +96,7 @@ private function setHttpClient(HttpClient $httpClient, MessageFactory $messageFa
     private function bindResources()
     {
         $this->entities = new ApiResource('entities', $this);
-        $this->me = new Me($this);
+        $this->me = new ApiResource('me', $this);
+        $this->subscriptions = new ApiResource('subscriptions', $this);
     }
 }