Merge pull request #34 from mailerlite/master

Update develop

Author: dominykasmailer

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 MailerLite
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

composer.json

@@ -5,6 +5,14 @@
     "license": "MIT",
     "keywords": ["mailerlite", "sdk", "email", "marketing"],
     "type": "library",
+    "authors": [
+        {
+            "name": "Justinas Pošiūnas",
+            "email": "justinas.posiunas@mailerlite.com",
+            "homepage": "https://mailerlite.com",
+            "role": "Developer"
+        }
+    ],
     "require": {
         "php" : "^5.5|^7.0",
         "guzzlehttp/psr7": "~1.2",

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;