Merge pull request #8 from anushr/log_format

Allow customization of log format

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.3
   - 5.4
   - 5.5
+  - 5.6
 
 before_script:
   - composer install -n --dev --prefer-source

DependencyInjection/Configuration.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Xola\OmnipayBundle\DependencyInjection;
+
+use Guzzle\Log\MessageFormatter;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class Configuration implements ConfigurationInterface
+{
+    /**
+     * Generates the configuration tree builder.
+     *
+     * @return TreeBuilder The tree builder
+     */
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder();
+        $rootNode = $treeBuilder->root('omnipay');
+        $rootNode->children()
+            ->arrayNode('log')->children()
+                ->scalarNode('format')
+                    ->defaultValue(MessageFormatter::DEBUG_FORMAT);
+
+        return $treeBuilder;
+    }
+}

DependencyInjection/OmnipayExtension.php

@@ -2,10 +2,10 @@
 
 namespace Xola\OmnipayBundle\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\DependencyInjection\Loader;
 
 /**
  * This is the class that loads and manages your bundle configuration
@@ -19,7 +19,11 @@ class OmnipayExtension extends Extension
      */
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+        $configuration = new Configuration();
+        $config = $this->processConfiguration($configuration, $configs);
+        $container->setParameter('omnipay.log.format', $config['log']['format']);
+
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
         $loader->load('services.yml');
     }
 }

Service/Omnipay.php

@@ -17,9 +17,11 @@ class Omnipay
     protected $config;
     protected $cache = array();
     protected $logger;
+    private $container;
 
     public function __construct(Container $container, LoggerInterface $logger)
     {
+        $this->container = $container;
         $this->initConfig($container->getParameterBag()->all());
         $this->logger = $logger;
     }
@@ -67,7 +69,7 @@ public function get($key = null)
         }
 
         $adapter = new PsrLogAdapter($this->logger);
-        $logPlugin = new LogPlugin($adapter, MessageFormatter::DEBUG_FORMAT);
+        $logPlugin = new LogPlugin($adapter, $this->config['log']['format']);
 
         $client = new Client();
         $client->addSubscriber($logPlugin);

Tests/Service/OmnipayTest.php

@@ -2,6 +2,7 @@
 
 namespace Xola\OmnipayBundle\Tests\Service;
 
+use Guzzle\Log\MessageFormatter;
 use Omnipay\Stripe\Gateway as StripeGateway;
 use Xola\OmnipayBundle\Service\Omnipay;
 
@@ -26,6 +27,7 @@ private function buildService($params = array())
      */
     private function getServiceContainer($params)
     {
+        $params['omnipay.log.format'] = MessageFormatter::DEBUG_FORMAT;
         $parameterBag = $this->getMock('Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface');
 
         $parameterBag
@@ -708,6 +710,9 @@ public function testGetConfig()
         $service = $this->buildService(array('container' => $serviceContainer));
 
         $expected = array(
+            'log' => array(
+                'format' => MessageFormatter::DEBUG_FORMAT
+            ),
             'world_pay' => array(
                 'installationId' => 'abc123',
                 'secretWord' => 'xyz987',