Merge pull request #34 from kmelia/feature/add-proxy

[feature] add proxy options

Author: slot

DependencyInjection/Configuration.php

@@ -56,6 +56,16 @@ public function getConfigTreeBuilder()
             ->end()
             ->scalarNode('api_key')->defaultNull()->end()
             ->scalarNode('disable_delivery')->defaultFalse()->end()
+            ->arrayNode('proxy')
+                ->addDefaultsIfNotSet()
+                ->children()
+                    ->booleanNode('use')->defaultFalse()->end()
+                    ->scalarNode('host')->defaultNull()->end()
+                    ->scalarNode('port')->defaultNull()->end()
+                    ->scalarNode('user')->defaultNull()->end()
+                    ->scalarNode('password')->defaultNull()->end()
+                ->end()
+            ->end()
         ->end();
 
         return $treeBuilder;

DependencyInjection/HipMandrillExtension.php

@@ -51,6 +51,7 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('hip_mandrill.default.sender', $config['default']['sender']);
         $container->setParameter('hip_mandrill.default.sender_name', $config['default']['sender_name']);
         $container->setParameter('hip_mandrill.default.subaccount', $config['default']['subaccount']);
+        $container->setParameter('hip_mandrill.proxy', $config['proxy']);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.yml');

Dispatcher.php

@@ -60,17 +60,29 @@ class Dispatcher
      */
     protected $defaultSenderName;
 
+    /**
+     * Proxy options
+     *
+     * @var array
+     */
+    protected $proxy;
+
     /**
      * @var bool
      */
     protected $disableDelivery;
 
-    public function __construct($service, $defaultSender, $defaultSenderName, $subaccount, $disableDelivery) {
+    public function __construct($service, $defaultSender, $defaultSenderName, $subaccount, $disableDelivery, $proxy) {
         $this->service = $service;
         $this->defaultSender = $defaultSender;
         $this->defaultSenderName = $defaultSenderName;
         $this->subaccount = $subaccount;
         $this->disableDelivery = $disableDelivery;
+        $this->proxy = $proxy;
+
+        if ($this->useProxy()) {
+            $this->addCurlProxyOptions();
+        }
     }
 
     /**
@@ -102,15 +114,32 @@ public function send(Message $message, $templateName = '', $templateContent = ar
 
         if (!empty($templateName)) {
             return $this->service->messages->sendTemplate($templateName, $templateContent, $message->toArray(), $async, $ipPool, $sendAt);
-
         }
 
         return $this->service->messages->send($message->toArray(), $async, $ipPool, $sendAt);
-
     }
 
+    private function useProxy()
+    {
+        return $this->proxy['use'];
+    }
 
-
-
-
+    private function addCurlProxyOptions()
+    {
+        if ($this->proxy['host'] !== null) {
+            curl_setopt($this->service->ch, CURLOPT_PROXY, $this->proxy['host']);
+        }
+        
+        if ($this->proxy['port'] !== null) {
+            curl_setopt($this->service->ch, CURLOPT_PROXYPORT, $this->proxy['port']);
+        }
+        
+        if ($this->proxy['user'] !== null && $this->proxy['password'] !== null) {
+            curl_setopt($this->service->ch, CURLOPT_PROXYUSERPWD, sprintf(
+                '%s:%s',
+                $this->proxy['user'],
+                $this->proxy['password']
+            ));
+        }
+    }
 }

README.md

@@ -72,6 +72,12 @@ hip_mandrill:
         sender: [email protected]
         sender_name: John Doe
         subaccount: Project # Optionally define a subaccount to use
+    proxy:
+        use: true # when you are behing a proxy. Default value is 'false'
+        host: example.com
+        port: 80
+        user: john
+        password: doe123
 ```
 
 Now you're all set, send your first transactional mails:

Resources/config/services.yml

@@ -9,6 +9,4 @@ services:
 
     hip_mandrill.dispatcher:
         class: %hip_mandrill.dispatcher.class%
-        arguments: [@hip_mandrill.client, %hip_mandrill.default.sender%, %hip_mandrill.default.sender_name%, %hip_mandrill.default.subaccount%, %hip_mandrill.disable_delivery%]
-
-
+        arguments: [@hip_mandrill.client, %hip_mandrill.default.sender%, %hip_mandrill.default.sender_name%, %hip_mandrill.default.subaccount%, %hip_mandrill.disable_delivery%, %hip_mandrill.proxy%]