From 1c7263fe9b536534e0a1e880f5c938a9fd2e4726 Mon Sep 17 00:00:00 2001
From: barelon <carlos@planetapluton.com>
Date: Thu, 25 Oct 2012 14:52:47 +0300
Subject: [PATCH 1/4] Update Resources/config/services.xml

---
 Resources/config/services.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index c7b931d..85ba888 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -11,8 +11,8 @@
         <parameter key="guzzle.plugin.service_builder.class">Guzzle\Service\Plugin\PluginCollectionPlugin</parameter>
         <parameter key="guzzle.plugin.data_collector.class">Ddeboer\GuzzleBundle\Guzzle\Http\Plugin\DataCollectorPlugin</parameter>
         <parameter key="guzzle.plugin.log.class">Guzzle\Http\Plugin\LogPlugin</parameter>
-        <parameter key="guzzle.plugin.log.monolog.adapter.class">Guzzle\Common\Log\MonologLogAdapter</parameter>
-        <parameter key="guzzle.plugin.log.array.adapter.class">Guzzle\Common\Log\ArrayLogAdapter</parameter>
+        <parameter key="guzzle.plugin.log.monolog.adapter.class">Guzzle\Log\MonologLogAdapter</parameter>
+        <parameter key="guzzle.plugin.log.array.adapter.class">Guzzle\Log\ArrayLogAdapter</parameter>
         <parameter key="guzzle.data_collector.class">Ddeboer\GuzzleBundle\DataCollector\HttpDataCollector</parameter>
 
         <parameter key="guzzle.cache_adapter.class"></parameter>

From 1265ddc164ae29a1948fb458f5134f02995f3ea0 Mon Sep 17 00:00:00 2001
From: barelon <carlos@planetapluton.com>
Date: Thu, 25 Oct 2012 14:53:49 +0300
Subject: [PATCH 2/4] Update DataCollector/HttpDataCollector.php

---
 DataCollector/HttpDataCollector.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DataCollector/HttpDataCollector.php b/DataCollector/HttpDataCollector.php
index 76c5ca4..a76a29f 100644
--- a/DataCollector/HttpDataCollector.php
+++ b/DataCollector/HttpDataCollector.php
@@ -15,7 +15,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-use Guzzle\Common\Log\LogAdapterInterface;
+use Guzzle\Log\LogAdapterInterface;
 
 /**
  * MessageDataCollector.

From becbc7687be7498e4a42ede6a346716a18c8877f Mon Sep 17 00:00:00 2001
From: barelon <carlos@planetapluton.com>
Date: Thu, 25 Oct 2012 16:52:31 +0300
Subject: [PATCH 3/4] Update Resources/config/services.xml

---
 Resources/config/services.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 85ba888..55c285d 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -16,8 +16,8 @@
         <parameter key="guzzle.data_collector.class">Ddeboer\GuzzleBundle\DataCollector\HttpDataCollector</parameter>
 
         <parameter key="guzzle.cache_adapter.class"></parameter>
-        <parameter key="guzzle.cache.adapter.doctrine.class">Guzzle\Common\Cache\DoctrineCacheAdapter</parameter>
-        <parameter key="guzzle.cache.adapter.zend.class">Guzzle\Common\Cache\Zf1CacheAdapter</parameter>
+        <parameter key="guzzle.cache.adapter.doctrine.class">Guzzle\Cache\DoctrineCacheAdapter</parameter>
+        <parameter key="guzzle.cache.adapter.zend.class">Guzzle\Cache\Zf1CacheAdapter</parameter>
         <parameter key="guzzle.cache.driver.apc.class">Doctrine\Common\Cache\ApcCache</parameter>
         <parameter key="guzzle.cache.driver.array.class">Doctrine\Common\Cache\ArrayCache</parameter>
     </parameters>

From 771600074119d20ac6b36648e8211975bdae09aa Mon Sep 17 00:00:00 2001
From: barelon <carlos@planetapluton.com>
Date: Thu, 25 Oct 2012 17:34:28 +0300
Subject: [PATCH 4/4] Update Resources/config/services.xml

---
 Resources/config/services.xml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index 55c285d..7065b98 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -8,9 +8,8 @@
         <parameter key="guzzle.service_builder.class">Guzzle\Service\Builder\ServiceBuilder</parameter>
         <parameter key="guzzle.service_builder_factory.class">Guzzle\Service\Builder\ServiceBuilder</parameter>
 
-        <parameter key="guzzle.plugin.service_builder.class">Guzzle\Service\Plugin\PluginCollectionPlugin</parameter>
         <parameter key="guzzle.plugin.data_collector.class">Ddeboer\GuzzleBundle\Guzzle\Http\Plugin\DataCollectorPlugin</parameter>
-        <parameter key="guzzle.plugin.log.class">Guzzle\Http\Plugin\LogPlugin</parameter>
+        <parameter key="guzzle.plugin.log.class">Guzzle\Plugin\Log\LogPlugin</parameter>
         <parameter key="guzzle.plugin.log.monolog.adapter.class">Guzzle\Log\MonologLogAdapter</parameter>
         <parameter key="guzzle.plugin.log.array.adapter.class">Guzzle\Log\ArrayLogAdapter</parameter>
         <parameter key="guzzle.data_collector.class">Ddeboer\GuzzleBundle\DataCollector\HttpDataCollector</parameter>
@@ -27,15 +26,11 @@
             <argument type="string" id="guzzle.service_builder.configuration_file">%guzzle.service_builder.configuration_file%</argument>
 
             <call method="addSubscriber">
-                <argument type="service" id="guzzle.plugin.service_builder" />
-            </call>
-        </service>
-
-        <service id="guzzle.plugin.service_builder" class="%guzzle.plugin.service_builder.class%" public="false">
-            <argument type="collection">
                 <argument type="service" id="guzzle.plugin.log.array" />
+            </call>
+            <call method="addSubscriber">
                 <argument type="service" id="guzzle.plugin.log.monolog" />
-            </argument>
+            </call>
         </service>
 
         <service id="guzzle.plugin.log.monolog" class="%guzzle.plugin.log.class%" public="false">
@@ -59,4 +54,4 @@
         </service>
     </services>
 
-</container>
+</container>
\ No newline at end of file