Start support MailChimp API v2.

.gitignore

@@ -1,2 +1,3 @@
 vendor
-.DS_Store
+.DS_Store
+composer.lock

Resources/meta/LICENSE → LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Miguel Perez
+Copyright (c) 2014 Miguel Perez
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Services/HttpClient.php → Lib/HttpClient.php

@@ -9,13 +9,12 @@
  * with this source code in the file LICENSE.
  */
 
-namespace MZ\MailChimpBundle\Services;
+namespace MZ\MailChimpBundle\Lib;
 
-use  Buzz\Browser,
-     Buzz\Client\Curl;
+Use \Curl;
 
 /**
- * HTTP client
+ * HTTP Client
  *
  * @author Miguel Perez <[email protected]>
  */
@@ -58,12 +57,20 @@ protected function makeRequest($apiCall, $payload, $export = false)
         } else {
             $url = $this->dataCenter . '1.3/?method=' . $apiCall;
         }
-        $curl = new Curl();
-        $curl->setOption(CURLOPT_USERAGENT, 'MZMailChimpBundle');
-        $browser = new Browser($curl);
-        $response = $browser->post($url, array(), http_build_query($payload));
 
-        return $response->getContent();
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        curl_setopt($ch, CURLOPT_USERAGENT, "MZMailChimpBundle");
+        curl_setopt($ch, CURLOPT_POST, true);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($payload));
+
+        $result = curl_exec($ch);
+        curl_close($ch);
+
+        var_dump($result);
+
+        return $result;
     }
 
 }

Services/MailChimp.php → Lib/v1/MailChimp.php

@@ -9,7 +9,7 @@
  * with this source code in the file LICENSE.
  */
 
-namespace MZ\MailChimpBundle\Services;
+namespace MZ\MailChimpBundle\Lib\v1;
 
 /**
  * Mailchimp
@@ -31,12 +31,12 @@ class MailChimp
      */
     public function __construct($apiKey, $listId, $ssl = true)
     {
-        trigger_error("API v1 has being deprecated by MailChimp. A new version of this bundle is being work on.", E_USER_DEPRECATED);
-
         $this->apiKey = $apiKey;
         $this->listId = $listId;
 
         $key = preg_split("/-/", $this->apiKey);
+
+        trigger_error("API v1 has being deprecated by MailChimp. Please use `Mailchimp.v2` service.", E_USER_DEPRECATED);
 
         if($ssl) {
             $this->dataCenter ='https://' . $key[1] . '.api.mailchimp.com/';

Services/Methods/MCCampaign.php → Lib/v1/Methods/MCCampaign.php

@@ -9,9 +9,9 @@
  * with this source code in the file LICENSE.
  */
 
-namespace MZ\MailChimpBundle\Services\Methods;
+namespace MZ\MailChimpBundle\Lib\v1\Methods;
 
-use MZ\MailChimpBundle\Services\HttpClient;
+use MZ\MailChimpBundle\Lib\HttpClient;
 
 /**
  * Mailchimp Campagin method

Services/Methods/MCEcommerce.php → Lib/v1/Methods/MCEcommerce.php

@@ -9,9 +9,9 @@
  * with this source code in the file LICENSE.
  */
 
-namespace MZ\MailChimpBundle\Services\Methods;
+namespace MZ\MailChimpBundle\Lib\v1\Methods;
 
-use MZ\MailChimpBundle\Services\HttpClient;
+use MZ\MailChimpBundle\Lib\HttpClient;
 
 /**
  * Mailchimp Ecommerce methods

Services/Methods/MCExport.php → Lib/v1/Methods/MCExport.php

@@ -9,9 +9,9 @@
  * with this source code in the file LICENSE.
  */
 
-namespace MZ\MailChimpBundle\Services\Methods;
+namespace MZ\MailChimpBundle\Lib\v1\Methods;
 
-use MZ\MailChimpBundle\Services\HttpClient;
+use MZ\MailChimpBundle\Lib\HttpClient;
 
 /**
  * Mailchimp Export api

Services/Methods/MCList.php → Lib/v1/Methods/MCList.php

@@ -9,9 +9,9 @@
  * with this source code in the file LICENSE.
  */
 
-namespace MZ\MailChimpBundle\Services\Methods;
+namespace MZ\MailChimpBundle\Lib\v1\Methods;
 
-use MZ\MailChimpBundle\Services\HttpClient;
+use MZ\MailChimpBundle\Lib\HttpClient;
 
 /**
  * Mailchimp List method

Lib/v2/MailChimp.php

@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * This file is part of the MZ\MailChimpBundle
+ *
+ * (c) Miguel Perez <[email protected]>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace MZ\MailChimpBundle\Lib\v2;
+
+/**
+ * Mailchimp
+ *
+ * @author Miguel Perez <[email protected]>
+ */
+class MailChimp 
+{
+
+    private $apiKey;
+    private $listId;
+    private $dataCenter;
+
+    /**
+     * Initializes MailChimp
+     *
+     * @param string $apiKey Mailchimp api key
+     * @param string $listId Default mailing list id
+     */
+    public function __construct($apiKey, $listId, $ssl = true)
+    {
+        $this->apiKey = $apiKey;
+        $this->listId = $listId;
+
+        $key = $this->setDataCenter($apiKey);
+
+        if($ssl) {
+            $this->dataCenter ='https://' . $key[1] . '.api.mailchimp.com/2.0/';
+        }else {
+            $this->dataCenter ='http://' . $key[1] . '.api.mailchimp.com/2.0/';
+        }
+
+        if (!function_exists('curl_init')) {
+            throw new \Exception('This bundle needs the cURL PHP extension.');
+        }
+    }
+
+    /**
+     * Get Mailchimp api key
+     *
+     * @return string
+     */
+    public function getAPIkey()
+    {
+        return $this->apiKey;
+    }
+
+    /**
+     * Set mailing list id
+     *
+     * @param string $listId mailing list id
+     */
+    public function setListID($listId)
+    {
+        $this->listId = $listId;
+    }
+
+    /**
+     * get mailing list id
+     *
+     * @return string $listId
+     */
+    public function getListID()
+    {
+        return $this->listId;
+    }
+
+    /**
+     * Set datacenter
+     *
+     * @param string $apiKey API key
+     */
+    private function setDataCenter($apiKey){
+        $this->dataCenter = preg_split("/-/", $apiKey);
+    }
+
+    /**
+     * get datacenter
+     *
+     * @return string $dataCenter
+     */
+    public function getDataCenter()
+    {
+        return $this->dataCenter;
+    }
+}

Resources/config/services.xml

@@ -8,11 +8,17 @@
         <parameter key="mz_mail_chimp.api_key">null</parameter>
         <parameter key="mz_mail_chimp.default_list">null</parameter>
         <parameter key="mz_mail_chimp.ssl">true</parameter>
-        <parameter key="mz_mail_chimp.mailchimp.service.class">MZ\MailChimpBundle\Services\MailChimp</parameter>
+        <parameter key="mz_mail_chimp.mailchimp.lib.v1.class">MZ\MailChimpBundle\Lib\v1\MailChimp</parameter>
+        <parameter key="mz_mail_chimp.mailchimp.lib.v2.class">MZ\MailChimpBundle\Lib\v2\MailChimp</parameter>
     </parameters>
 
     <services>
-        <service id="MailChimp" class="%mz_mail_chimp.mailchimp.service.class%">
+        <service id="MailChimp" class="%mz_mail_chimp.mailchimp.lib.v1.class%">
+            <argument>%mz_mail_chimp.api_key%</argument>
+            <argument>%mz_mail_chimp.default_list%</argument>
+            <argument>%mz_mail_chimp.ssl%</argument>
+        </service>
+        <service id="MailChimp.v2" class="%mz_mail_chimp.mailchimp.lib.v2.class%">
             <argument>%mz_mail_chimp.api_key%</argument>
             <argument>%mz_mail_chimp.default_list%</argument>
             <argument>%mz_mail_chimp.ssl%</argument>

composer.json

@@ -18,7 +18,7 @@
         "ext-curl": "*"
     },
     "autoload": {
-        "psr-0": { "MZ\\MailChimpBundle": "" }
+        "psr-0": { "MZ\\MailChimpBundle": "src/" }
     },
     "target-dir": "MZ/MailChimpBundle"
 }