Update and fix bug

ALTELMA · May 15, 2019 · eba9f43 · eba9f43
1 parent 51a4259
commit eba9f43
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 29 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     "authors": [
         {
             "name": "ALTELMA",
-            "email": "phongthorn.a@gmail.com"
+            "email": "nrohtgnohp@gmail.com"
         }
     ],
     "require": {
@@ -21,12 +21,19 @@
     "autoload": {
         "psr-4": {
             "Altelma\\LaravelMailChimp\\": "src/"
-        }
+        },
+        "files": [
+            "src/helpers.php"
+        ]
     },
     "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
+        "laravel": {
+            "providers": [
+                "Altelma\\JWT\\JWTServiceProvider"
+            ],
+            "aliases": {
+                "JWT": "Altelma\\JWT\\MailChimpFacade"
+            }
         }
-    },
-    "minimum-stability": "dev"
+    }
 }
diff --git a/config/mailchimp.php b/config/mailchimp.php
@@ -1,5 +1,8 @@
 <?php
 
 return [
-    'api-key'     => '',
+    'apiKey' => '',
+    'lists' => [
+        'newsletter' => ''
+    ]
 ];
diff --git a/src/MailChimpService.php b/src/MailChimpService.php
@@ -1,52 +1,84 @@
 <?php
 
-namespace LaravelMailChimp;
+namespace Altelma\LaravelMailChimp;
 
 class MailChimpService
 {
-    private $apikey;
+    private $apiKey;
     private $endpoint = 'https://us1.api.mailchimp.com/3.0/';
 
-    public function __construct($apikey = '')
+    public function __construct(string $apiKey = '')
     {
-        $this->apikey = $apikey;
-        $this->getEndpoint($apikey);
+        $this->apiKey = $apiKey;
+        $this->getEndpoint($apiKey);
     }
 
-    private function getEndpoint($apikey)
+    /**
+     * @param string $apiKey
+     */
+    private function getEndpoint(string $apiKey)
     {
-        // if (!strpos($apikey, 'us1') !== FALSE) {
-        $dc = explode('-', $apikey)[1];
+        $dc = explode('-', $apiKey)[1];
         $this->endpoint = str_replace('us1', $dc, $this->endpoint);
-        // }
     }
 
-    public function get($method, $args = [])
+    /**
+     * @param string $method
+     * @param array $args
+     * @return mixed
+     */
+    public function get(string $method, array $args = [])
     {
         return $this->makeRequest('get', $method, $args);
     }
 
-    public function post($method, $args = [])
+    /**
+     * @param string $method
+     * @param array $args
+     * @return mixed
+     */
+    public function post(string $method, array $args = [])
     {
         return $this->makeRequest('post', $method, $args);
     }
 
-    public function patch($method, $args = [])
+    /**
+     * @param string $method
+     * @param array $args
+     * @return mixed
+     */
+    public function patch(string $method, array $args = [])
     {
         return $this->makeRequest('patch', $method, $args);
     }
 
+    /**
+     * @param $method
+     * @param array $args
+     * @return mixed
+     */
     public function put($method, $args = [])
     {
         return $this->makeRequest('put', $method, $args);
     }
 
-    public function delete($method, $args = [])
+    /**
+     * @param string $method
+     * @param array $args
+     * @return mixed
+     */
+    public function delete(string $method, array $args = [])
     {
         return $this->makeRequest('delete', $method, $args);
     }
 
-    private function makeRequest($request, $method, $args = [])
+    /**
+     * @param string $request
+     * @param string $method
+     * @param array $args
+     * @return mixed
+     */
+    private function makeRequest(string $request, string $method, array $args = [])
     {
         $url = $this->endpoint.$method;
         $json_data = json_encode($args, JSON_FORCE_OBJECT);
@@ -56,7 +88,7 @@ private function makeRequest($request, $method, $args = [])
         curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
         curl_setopt($ch, CURLOPT_HTTPHEADER, ['Accept: application/vnd.api+json',
             'Content-Type: application/vnd.api+json',
-            'Authorization: apikey '.$this->apikey, ]);
+            'Authorization: apikey '.$this->apiKey, ]);
         // curl_setopt($ch, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($ch, CURLOPT_TIMEOUT, 10);

diff --git a/src/MailChimpServiceProvider.php b/src/MailChimpServiceProvider.php
@@ -28,14 +28,17 @@ public function register()
         $this->mergeConfigFrom(__DIR__.'/../config/mailchimp.php', 'mailchimp');
         $this->app->singleton('MailChimp', function ($app) {
             $config = $app->make('config');
-            $token = $config->get('mailchimp.apikey');
+            $token = $config->get('mailchimp.apiKey');
 
             return new MailChimpService($token);
         });
     }
 
+    /**
+     * @return array
+     */
     public function provides()
     {
-        return ['MailChimp'];
+        return ['mailchimp'];
     }
 }
diff --git a/src/config/mailchimp.php b/src/config/mailchimp.php
diff --git a/src/helpers.php b/src/helpers.php
@@ -0,0 +1,14 @@
+<?php
+
+if (!function_exists('config_path')) {
+    /**
+     * Get the configuration path.
+     *
+     * @param string $path
+     * @return string
+     */
+    function config_path($path = '')
+    {
+        return app()->basePath() . '/config' . ($path ? '/' . $path : $path);
+    }
+}