Merge pull request #15 from karlkeefer/urlencode_emails

urlencode() troublesome url params and consistent camelCase

Author: tadaspaplauskas

src/Api/Groups.php

@@ -34,12 +34,12 @@ public function getSubscribers($groupId, $type = null, $params = [])
      * Get single subscriber from group
      *
      * @param $groupId
-     * @param $subscriber_id
+     * @param $subscriberId
      * @return mixed
      */
-    public function getSubscriber($groupId, $subscriber_id)
+    public function getSubscriber($groupId, $subscriberId)
     {
-        $endpoint = $this->endpoint . '/' . $groupId . '/subscribers/' . $subscriber_id;
+        $endpoint = $this->endpoint . '/' . $groupId . '/subscribers/' . urlencode($subscriberId);
 
         $response = $this->restClient->get($endpoint);
 
@@ -73,7 +73,7 @@ public function addSubscriber($groupId, $subscriberData = [], $params = [])
      */
     public function removeSubscriber($groupId, $subscriberId)
     {
-        $endpoint = $this->endpoint . '/' . $groupId . '/subscribers/' . $subscriberId;
+        $endpoint = $this->endpoint . '/' . $groupId . '/subscribers/' . urlencode($subscriberId);
 
         $response = $this->restClient->delete($endpoint);
 

src/Api/Subscribers.php

@@ -17,7 +17,7 @@ class Subscribers extends ApiAbstract {
      */
     public function getGroups($subscriberId, $params = [])
     {
-        $endpoint = $this->endpoint . '/' . $subscriberId . '/groups';
+        $endpoint = $this->endpoint . '/' . urlencode($subscriberId) . '/groups';
 
         $params = array_merge($this->prepareParams(), $params);
 
@@ -36,7 +36,7 @@ public function getGroups($subscriberId, $params = [])
      */
     public function getActivity($subscriberId, $type = null, $params = [])
     {
-        $endpoint = $this->endpoint . '/' . $subscriberId . '/activity';
+        $endpoint = $this->endpoint . '/' . urlencode($subscriberId) . '/activity';
 
         if ($type !== null) {
             $endpoint .= '/' . $type;