From 16c8bfbc5a166357e0b8ffb126492261ab98e4e9 Mon Sep 17 00:00:00 2001
From: Charles Sarrazin <charles@sarraz.in>
Date: Tue, 19 May 2015 02:09:19 +0200
Subject: [PATCH 1/8] Added a simpler way to configure the cache subscriber and
 deprecated old configuration keys

---
 src/DependencyInjection/Configuration.php     | 33 +++++++++++++++++--
 .../CsaGuzzleExtension.php                    | 15 +++++----
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 3d0decc0..397eb8e5 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -112,9 +112,38 @@ private function createCacheNode()
         $node = $treeBuilder->root('cache');
 
         $node
+            ->beforeNormalization()
+                ->ifTrue(function ($v) {
+                    return isset($v['service']);
+                })
+                ->then(function ($v) {
+                    trigger_error('The csa_guzzle.cache.service configuration key is deprecated since version 1.3 and will be removed in 2.0. Please directly use csa_guzzle.cache.adapter instead', E_USER_DEPRECATED);
+
+                    return $v;
+                })
+            ->end()
             ->canBeEnabled()
             ->children()
                 ->arrayNode('adapter')
+                    ->beforeNormalization()
+                        ->ifTrue(function ($v) {
+                            return is_array($v) && (isset($v['type']) || isset($v['service']));
+                        })
+                        ->then(function ($v) {
+                            trigger_error('The csa_guzzle.cache.adapter.type and csa_guzzle.cache.adapter.service configuration keys are deprecated since version 1.3 and will be removed in 2.0. Please directly use csa_guzzle.cache.adapter instead', E_USER_DEPRECATED);
+
+                            return $v;
+                        })
+                    ->end()
+                    ->beforeNormalization()
+                        ->ifString()
+                        ->then(function ($v) {
+                            return [
+                                'type' => 'custom',
+                                'service' => $v,
+                            ];
+                        })
+                    ->end()
                     ->addDefaultsIfNotSet(['type' => 'doctrine'])
                     ->validate()
                         ->ifTrue(function ($v) {
@@ -130,10 +159,10 @@ private function createCacheNode()
                                 ->thenInvalid('Invalid cache adapter')
                             ->end()
                         ->end()
-                        ->scalarNode('service')->end()
+                        ->scalarNode('service')->defaultNull()->end()
                     ->end()
                 ->end()
-                ->scalarNode('service')->isRequired()->end()
+                ->scalarNode('service')->defaultNull()->end()
             ->end()
         ;
 
diff --git a/src/DependencyInjection/CsaGuzzleExtension.php b/src/DependencyInjection/CsaGuzzleExtension.php
index f44e19cf..e0ca69eb 100644
--- a/src/DependencyInjection/CsaGuzzleExtension.php
+++ b/src/DependencyInjection/CsaGuzzleExtension.php
@@ -38,7 +38,6 @@ public function load(array $configs, ContainerBuilder $container)
         $loader->load('collector.xml');
         $loader->load('twig.xml');
         $loader->load('factory.xml');
-
         $loader->load('services.xml');
 
         $descriptionFactory = $container->getDefinition('csa_guzzle.description_factory');
@@ -53,7 +52,6 @@ public function load(array $configs, ContainerBuilder $container)
             $container->removeDefinition('csa_guzzle.twig.extension');
         }
 
-
         $loggerDefinition = $container->getDefinition('csa_guzzle.subscriber.logger');
 
         if ($config['logger']['service']) {
@@ -84,12 +82,15 @@ private function processCacheConfiguration(array $config, ContainerBuilder $cont
             return;
         }
 
-        $adapterId = ('custom' === $config['adapter']['type'])
-            ? $config['adapter']['service']
-            : sprintf('csa_guzzle.cache.adapter.%s', $config['adapter']['type']);
+        $adapterId = $config['adapter']['service'];
+
+        if ('doctrine' === $config['adapter']['type']) {
+            $adapterId = 'csa_guzzle.cache.adapter.doctrine';
+
+            $adapter = $container->getDefinition($adapterId);
+            $adapter->addArgument(new Reference($config['service']));
+        }
 
-        $adapter = $container->getDefinition($adapterId);
-        $adapter->addArgument(new Reference($config['service']));
         $container->setAlias('csa_guzzle.default_cache_adapter', $adapterId);
     }
 

From 1a05a03e0253da8b7e3c02e1deaa090e09119d98 Mon Sep 17 00:00:00 2001
From: Charles Sarrazin <charles@sarraz.in>
Date: Tue, 19 May 2015 02:36:17 +0200
Subject: [PATCH 2/8] Added handling for a special case, with the default
 configuration

---
 src/DependencyInjection/Configuration.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 397eb8e5..5c2e37a2 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -122,6 +122,12 @@ private function createCacheNode()
                     return $v;
                 })
             ->end()
+            ->validate()
+                ->ifTrue(function ($v) {
+                    return null === $v['service'] && null === $v['adapter']['service'];
+                })
+                ->thenInvalid('The csa_guzzle.cache.adapter key should be configured.')
+            ->end()
             ->canBeEnabled()
             ->children()
                 ->arrayNode('adapter')

From f4f5c2fec36b72c468259bbcddc4acc0d05c9de9 Mon Sep 17 00:00:00 2001
From: Charles Sarrazin <charles@sarraz.in>
Date: Tue, 19 May 2015 02:36:39 +0200
Subject: [PATCH 3/8] Updated doc for the new cache adapter configuration

---
 src/Resources/doc/available_subscribers.md   | 30 ++++++++++----------
 src/Resources/doc/configuration_reference.md |  7 ++---
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/Resources/doc/available_subscribers.md b/src/Resources/doc/available_subscribers.md
index 9b5a1506..f58da8ea 100644
--- a/src/Resources/doc/available_subscribers.md
+++ b/src/Resources/doc/available_subscribers.md
@@ -81,9 +81,10 @@ The `cache` subscriber
 
 The `cache` subscriber's objective is to provide a very simple cache, in order to cache Guzzle responses.
 
-Even though only a [doctrine/cache](https://github.com/doctrine/cache) implementation is provided, the
-subscriber is agnostic. If you wish to use your own cache implementation with the `cache` subscriber, you
-simply need to implement `Csa\Bundle\GuzzleBundle\GuzzleHttp\Cache\StorageAdapterInterface`, and you're set!
+Even though only a [doctrine/cache](https://github.com/doctrine/cache) adapter is provided
+(`Csa\Bundle\GuzzleBundle\GuzzleHttp\Cache\DoctrineAdapter`), the subscriber is agnostic.
+If you wish to use your own cache implementation with the `cache` subscriber, you simply need
+to implement `Csa\Bundle\GuzzleBundle\GuzzleHttp\Cache\StorageAdapterInterface`, and you're set!
 
 This subscriber can be configured with the following configuration:
 
@@ -91,19 +92,18 @@ This subscriber can be configured with the following configuration:
 csa_guzzle:
     cache:
         enabled: true
-        adapter:
-            type: doctrine
-        service: my.cache.service
+        adapter: my_storage_adapter
 ```
 
-You may even set your own adapter using the following configuration:
+To use the doctrine cache adapter, you need to use the `Csa\Bundle\GuzzleBundle\GuzzleHttp\Cache\DoctrineAdapter`
+class, in which you should inject your doctrine cache service. For example, using doctrine/cache's `FilesystemCache`:
 
-```yml
-csa_guzzle:
-    cache:
-        enabled: true
-        adapter:
-            type: custom
-            service: my.adapter.service
-        service: my.cache.service
+```xml
+<service id="my_storage_adapter" class="Csa\Bundle\GuzzleBundle\GuzzleHttp\Cache\DoctrineAdapter">
+    <argument type="service" id="my_cache_service" />
+</service>
+
+<service id="my_cache_service" class="Doctrine\Common\Cache\FilesystemCache">
+    <argument>%kernel.cache_dir%/my_cache_folder</argument>
+</service>
 ```
diff --git a/src/Resources/doc/configuration_reference.md b/src/Resources/doc/configuration_reference.md
index 89af97f7..f48e9daa 100644
--- a/src/Resources/doc/configuration_reference.md
+++ b/src/Resources/doc/configuration_reference.md
@@ -22,9 +22,6 @@ csa_guzzle:
                 subscriber_name:      ~
     factory_class:        GuzzleHttp\Client
     cache:
-        enabled:              false
-        adapter:
-            type:                 doctrine
-            service:              ~
-        service:              ~ # Required
+        enabled: false
+        adapter: ~
 ```

From 7aa7736466424f9ea8320e067fae3750a3ea831d Mon Sep 17 00:00:00 2001
From: Charles Sarrazin <charles@sarraz.in>
Date: Tue, 19 May 2015 02:54:59 +0200
Subject: [PATCH 4/8] Started preparing UPGRADE.md for 1.3 and 2.0

---
 UPGRADE.md | 57 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index 74f5f8f6..e2c09563 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,12 +1,13 @@
 UPGRADE documentation
 =====================
 
-* Upgrade [from 1.0 to 1.1](UPGRADE-1.1.md)
-* Upgrade [from 1.1 to 1.2](UPGRADE-1.2.md)
-* Upgrade [from 1.2 to 1.3](UPGRADE-1.3.md)
+* Upgrade [from 1.0 to 1.1](#upgrade-from-10-to-11)
+* Upgrade [from 1.1 to 1.2](#upgrade-from-11-to-12)
+* Upgrade [from 1.2 to 1.3](#upgrade-from-12-to-13)
+* Upgrade [from 1.x to 2.0](#upgrade-from-1x-to-20)
 
-UPGRADE FROM 1.0 to 1.1 [from 1.0 to 1.1]
------------------------------------------
+UPGRADE FROM 1.0 to 1.1
+-----------------------
 
 ### Known Backwards-Compatibility Breaks
 
@@ -41,36 +42,44 @@ After:
 </container>
 ```
 
-UPGRADE FROM 1.1 to 1.2 [from 1.1 to 1.2]
------------------------------------------
+UPGRADE FROM 1.1 to 1.2
+-----------------------
 
 ### Known Backwards-Compatibility Breaks
 
 * None yet
 
-UPGRADE FROM 1.2 to 1.3 [from 1.2 to 1.3]
------------------------------------------
+UPGRADE FROM 1.2 to 1.3
+-----------------------
 
 ### Known Backward-Compatibility Breaks
 
 * `ClientFactory` was deprecated in favor of directly tagging Guzzle clients,
   and will be removed in 2.0.
 
-  Before:
+Before:
 
-  ```xml
-  <service
-          id="acme.client"
-          class="%acme.client.class%"
-          factory-service="csa_guzzle.client_factory"
-          factory-method="create">
-      <!-- An array of configuration values -->
-  </service>
-  ```
+```xml
+<service
+    id="acme.client"
+    class="%acme.client.class%"
+    factory-service="csa_guzzle.client_factory"
+    factory-method="create">
+<!-- An array of configuration values -->
+</service>
+```
 
-  After:
+After:
 
-  ```xml
-  <service id="acme.client" class="%acme.client.class%">
-      <tag name="csa_guzzle.client" />
-  </service>
+```xml
+<service id="acme.client" class="%acme.client.class%">
+    <tag name="csa_guzzle.client" />
+</service>
+```
+
+UPGRADE FROM 1.x to 2.0
+-----------------------
+
+### Known Backwards-Compatibility Breaks
+
+* None yet

From 741a870250afd85f3eb2711013d7a3027a6c5203 Mon Sep 17 00:00:00 2001
From: Charles Sarrazin <charles@sarraz.in>
Date: Sun, 31 May 2015 23:19:30 +0200
Subject: [PATCH 5/8] Normally fixed issue with php 5.5+ builds on travis ci

---
 src/HttpFoundation/StreamResponse.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/HttpFoundation/StreamResponse.php b/src/HttpFoundation/StreamResponse.php
index 886752ab..52b01256 100644
--- a/src/HttpFoundation/StreamResponse.php
+++ b/src/HttpFoundation/StreamResponse.php
@@ -33,7 +33,7 @@ public function sendContent()
         $chunked = $this->headers->has('Transfer-Encoding');
         $this->content->seek(0);
 
-        while (!$this->content->eof()) {
+        for (;;) {
             $chunk = $this->content->read($this->bufferSize);
 
             if ($chunked) {
@@ -47,11 +47,10 @@ public function sendContent()
             }
 
             flush();
-        }
 
-        if ($chunked) {
-            echo sprintf("%x\r\n\r\n", 0);
-            flush();
+            if (!$chunk) {
+                return;
+            }
         }
     }
 

From 1676b490a0cdd659175d4859486bad27b43747af Mon Sep 17 00:00:00 2001
From: Charles Sarrazin <charles@sarraz.in>
Date: Wed, 3 Jun 2015 01:53:24 +0200
Subject: [PATCH 6/8] Added backward incompatibilities for v2.0.0.

---
 UPGRADE.md    | 7 +++++--
 composer.json | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/UPGRADE.md b/UPGRADE.md
index e2c09563..47608962 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -47,7 +47,7 @@ UPGRADE FROM 1.1 to 1.2
 
 ### Known Backwards-Compatibility Breaks
 
-* None yet
+* None yet.
 
 UPGRADE FROM 1.2 to 1.3
 -----------------------
@@ -82,4 +82,7 @@ UPGRADE FROM 1.x to 2.0
 
 ### Known Backwards-Compatibility Breaks
 
-* None yet
+* `ClientFactory` is removed.
+* The bundle now needs at least version `6.0` of `guzzlehttp/guzzle`.
+* Client and cache configuration have been simplified.
+* PHP version requirement has been bumped to at least `5.5.0`.
diff --git a/composer.json b/composer.json
index 65cea79a..54f9ef0a 100644
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "guzzlehttp/guzzle": "~4.0 | ~5.0",
+        "guzzlehttp/guzzle": "~4.0|~5.0",
         "guzzlehttp/log-subscriber": "~1.0",
         "symfony/framework-bundle": "~2.3|~3.0",
         "twig/twig": "~1.12",

From 50a84066a33206f5e4d92daf07d73df9af4d9d1d Mon Sep 17 00:00:00 2001
From: Charles Sarrazin <charles@sarraz.in>
Date: Wed, 3 Jun 2015 03:37:59 +0200
Subject: [PATCH 7/8] Added more deprecations, as well as some tests

---
 composer.lock                                 | 480 +++++++++---------
 src/DependencyInjection/Configuration.php     |   2 +-
 src/Factory/ClientFactory.php                 |  11 +
 .../CsaGuzzleExtensionTest.php                |  95 +++-
 src/Tests/Factory/ClientFactoryTest.php       |   4 +-
 src/Tests/Fixtures/github.description.json    | 216 ++++++++
 6 files changed, 562 insertions(+), 246 deletions(-)
 create mode 100644 src/Tests/Fixtures/github.description.json

diff --git a/composer.lock b/composer.lock
index 02075374..31bd41f7 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "f83c7737409ac047086519c98565bd4b",
+    "hash": "f2976e7eebcb8b478cd61c7b62647f41",
     "packages": [
         {
             "name": "doctrine/annotations",
@@ -12,12 +12,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e"
+                "reference": "c8927ad70c6fce36b3af52c17ed996c9aa4de89b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/b5202eb9e83f8db52e0e58867e0a46e63be8332e",
-                "reference": "b5202eb9e83f8db52e0e58867e0a46e63be8332e",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/c8927ad70c6fce36b3af52c17ed996c9aa4de89b",
+                "reference": "c8927ad70c6fce36b3af52c17ed996c9aa4de89b",
                 "shasum": ""
             },
             "require": {
@@ -72,7 +72,7 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2014-12-23 22:40:37"
+            "time": "2015-05-13 13:47:35"
         },
         {
             "name": "doctrine/lexer",
@@ -130,33 +130,27 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "5.2.0",
+            "version": "5.3.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "475b29ccd411f2fa8a408e64576418728c032cfa"
+                "reference": "28475a313d7d413a033b68d762e0db18b3aa4b02"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/475b29ccd411f2fa8a408e64576418728c032cfa",
-                "reference": "475b29ccd411f2fa8a408e64576418728c032cfa",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/28475a313d7d413a033b68d762e0db18b3aa4b02",
+                "reference": "28475a313d7d413a033b68d762e0db18b3aa4b02",
                 "shasum": ""
             },
             "require": {
-                "guzzlehttp/ringphp": "~1.0",
+                "guzzlehttp/ringphp": "^1.1",
                 "php": ">=5.4.0"
             },
             "require-dev": {
                 "ext-curl": "*",
-                "phpunit/phpunit": "~4.0",
-                "psr/log": "~1.0"
+                "phpunit/phpunit": "^4.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "GuzzleHttp\\": "src/"
@@ -184,7 +178,7 @@
                 "rest",
                 "web service"
             ],
-            "time": "2015-01-28 01:03:29"
+            "time": "2015-05-26 17:54:26"
         },
         {
             "name": "guzzlehttp/log-subscriber",
@@ -245,12 +239,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/RingPHP.git",
-                "reference": "2498ee848cd01639aecdcf3d5a257bace8665b7c"
+                "reference": "9465032ac5d6beaa55f10923403e6e1c36018d9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/2498ee848cd01639aecdcf3d5a257bace8665b7c",
-                "reference": "2498ee848cd01639aecdcf3d5a257bace8665b7c",
+                "url": "https://api.github.com/repos/guzzle/RingPHP/zipball/9465032ac5d6beaa55f10923403e6e1c36018d9c",
+                "reference": "9465032ac5d6beaa55f10923403e6e1c36018d9c",
                 "shasum": ""
             },
             "require": {
@@ -268,7 +262,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "1.1-dev"
                 }
             },
             "autoload": {
@@ -288,7 +282,7 @@
                 }
             ],
             "description": "Provides a simple API and specification that abstracts away the details of HTTP into a single PHP function.",
-            "time": "2015-05-01 04:57:09"
+            "time": "2015-05-21 17:23:02"
         },
         {
             "name": "guzzlehttp/streams",
@@ -346,14 +340,17 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "bf2c13de4300e227d7b2fd08027673a79c519987"
+                "reference": "9e45edca52cc9c954680072c93e621f8b71fab26"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/bf2c13de4300e227d7b2fd08027673a79c519987",
-                "reference": "bf2c13de4300e227d7b2fd08027673a79c519987",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/9e45edca52cc9c954680072c93e621f8b71fab26",
+                "reference": "9e45edca52cc9c954680072c93e621f8b71fab26",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=5.3.0"
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -381,7 +378,7 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2015-03-26 14:39:45"
+            "time": "2015-06-02 13:48:41"
         },
         {
             "name": "react/promise",
@@ -433,12 +430,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/asset.git",
-                "reference": "a5c77d33fe6a9213954a21e52eb170bfcea50ec1"
+                "reference": "217f2479852eba3ec890907da296a7ca460725e0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/asset/zipball/a5c77d33fe6a9213954a21e52eb170bfcea50ec1",
-                "reference": "a5c77d33fe6a9213954a21e52eb170bfcea50ec1",
+                "url": "https://api.github.com/repos/symfony/asset/zipball/217f2479852eba3ec890907da296a7ca460725e0",
+                "reference": "217f2479852eba3ec890907da296a7ca460725e0",
                 "shasum": ""
             },
             "require": {
@@ -467,18 +464,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Asset Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-10 07:31:54"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-12 15:48:43"
         },
         {
             "name": "symfony/config",
@@ -486,12 +483,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Config.git",
-                "reference": "e6248b5b517846524c94912307321b9e87967938"
+                "reference": "cbc4f34db52f211b9f4ea1aceea37056a9df9100"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Config/zipball/e6248b5b517846524c94912307321b9e87967938",
-                "reference": "e6248b5b517846524c94912307321b9e87967938",
+                "url": "https://api.github.com/repos/symfony/Config/zipball/cbc4f34db52f211b9f4ea1aceea37056a9df9100",
+                "reference": "cbc4f34db52f211b9f4ea1aceea37056a9df9100",
                 "shasum": ""
             },
             "require": {
@@ -517,18 +514,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Config Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-15 14:16:35"
         },
         {
             "name": "symfony/debug",
@@ -536,12 +533,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Debug.git",
-                "reference": "c8a2e1afd14fed1d24cff576d6c90024214cb58b"
+                "reference": "142cddfce4beee0d4382b21cfebe1074ba639cbf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/c8a2e1afd14fed1d24cff576d6c90024214cb58b",
-                "reference": "c8a2e1afd14fed1d24cff576d6c90024214cb58b",
+                "url": "https://api.github.com/repos/symfony/Debug/zipball/142cddfce4beee0d4382b21cfebe1074ba639cbf",
+                "reference": "142cddfce4beee0d4382b21cfebe1074ba639cbf",
                 "shasum": ""
             },
             "require": {
@@ -577,18 +574,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Debug Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 17:52:00"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-15 14:16:35"
         },
         {
             "name": "symfony/dependency-injection",
@@ -596,12 +593,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/DependencyInjection.git",
-                "reference": "5a50e4ac1b91241737de8126bb844f7bc250755b"
+                "reference": "a9cc7ce561671093996cffd2e73bca9c2ed9e099"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/5a50e4ac1b91241737de8126bb844f7bc250755b",
-                "reference": "5a50e4ac1b91241737de8126bb844f7bc250755b",
+                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/a9cc7ce561671093996cffd2e73bca9c2ed9e099",
+                "reference": "a9cc7ce561671093996cffd2e73bca9c2ed9e099",
                 "shasum": ""
             },
             "require": {
@@ -634,18 +631,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony DependencyInjection Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-16 13:13:50"
         },
         {
             "name": "symfony/event-dispatcher",
@@ -653,12 +650,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/EventDispatcher.git",
-                "reference": "b42ba1e35bf95eeb87c5ecb9e3141a6e3c7c65b3"
+                "reference": "f991afd968ea05582bae203754d761714598d018"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/b42ba1e35bf95eeb87c5ecb9e3141a6e3c7c65b3",
-                "reference": "b42ba1e35bf95eeb87c5ecb9e3141a6e3c7c65b3",
+                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/f991afd968ea05582bae203754d761714598d018",
+                "reference": "f991afd968ea05582bae203754d761714598d018",
                 "shasum": ""
             },
             "require": {
@@ -692,18 +689,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony EventDispatcher Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-12 15:48:43"
         },
         {
             "name": "symfony/expression-language",
@@ -711,12 +708,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/expression-language.git",
-                "reference": "d18efc421a0b4f57f8e144e06544d035758e7227"
+                "reference": "4638047b6959ca8fda3d242742cb42b12d3a6636"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/expression-language/zipball/d18efc421a0b4f57f8e144e06544d035758e7227",
-                "reference": "d18efc421a0b4f57f8e144e06544d035758e7227",
+                "url": "https://api.github.com/repos/symfony/expression-language/zipball/4638047b6959ca8fda3d242742cb42b12d3a6636",
+                "reference": "4638047b6959ca8fda3d242742cb42b12d3a6636",
                 "shasum": ""
             },
             "require": {
@@ -741,18 +738,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony ExpressionLanguage Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-12 15:48:43"
         },
         {
             "name": "symfony/filesystem",
@@ -760,12 +757,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Filesystem.git",
-                "reference": "318dedf57c535496c1d0f1a7cd25dd38d377628a"
+                "reference": "80a0bc4be4c2b037909e9e1a3abefd293a17a1a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/318dedf57c535496c1d0f1a7cd25dd38d377628a",
-                "reference": "318dedf57c535496c1d0f1a7cd25dd38d377628a",
+                "url": "https://api.github.com/repos/symfony/Filesystem/zipball/80a0bc4be4c2b037909e9e1a3abefd293a17a1a2",
+                "reference": "80a0bc4be4c2b037909e9e1a3abefd293a17a1a2",
                 "shasum": ""
             },
             "require": {
@@ -790,18 +787,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Filesystem Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-16 13:09:29"
         },
         {
             "name": "symfony/framework-bundle",
@@ -809,12 +806,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/FrameworkBundle.git",
-                "reference": "02baec1eb56e1eca87adaebf0884aa04ee82a1db"
+                "reference": "698c6bf9fdb43a71d40417e5ef8118d0302a77dd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/FrameworkBundle/zipball/02baec1eb56e1eca87adaebf0884aa04ee82a1db",
-                "reference": "02baec1eb56e1eca87adaebf0884aa04ee82a1db",
+                "url": "https://api.github.com/repos/symfony/FrameworkBundle/zipball/698c6bf9fdb43a71d40417e5ef8118d0302a77dd",
+                "reference": "698c6bf9fdb43a71d40417e5ef8118d0302a77dd",
                 "shasum": ""
             },
             "require": {
@@ -874,18 +871,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony FrameworkBundle",
-            "homepage": "http://symfony.com",
-            "time": "2015-05-06 00:54:25"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-16 13:13:50"
         },
         {
             "name": "symfony/http-foundation",
@@ -893,12 +890,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpFoundation.git",
-                "reference": "78fdb418f81b4bbc8ad7747c7fb3883aea625b79"
+                "reference": "f2930ef7cf8a2e1c0d49a5495f467586a20fcb9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/78fdb418f81b4bbc8ad7747c7fb3883aea625b79",
-                "reference": "78fdb418f81b4bbc8ad7747c7fb3883aea625b79",
+                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/f2930ef7cf8a2e1c0d49a5495f467586a20fcb9c",
+                "reference": "f2930ef7cf8a2e1c0d49a5495f467586a20fcb9c",
                 "shasum": ""
             },
             "require": {
@@ -927,18 +924,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony HttpFoundation Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-16 13:06:49"
         },
         {
             "name": "symfony/http-kernel",
@@ -946,12 +943,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/HttpKernel.git",
-                "reference": "b90d2ca1027243c266ece6a8be208bae080712e5"
+                "reference": "897836f4af4ecd620804c64e76949e1383ce4330"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/b90d2ca1027243c266ece6a8be208bae080712e5",
-                "reference": "b90d2ca1027243c266ece6a8be208bae080712e5",
+                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/897836f4af4ecd620804c64e76949e1383ce4330",
+                "reference": "897836f4af4ecd620804c64e76949e1383ce4330",
                 "shasum": ""
             },
             "require": {
@@ -1007,18 +1004,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony HttpKernel Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 16:45:10"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-16 08:01:59"
         },
         {
             "name": "symfony/routing",
@@ -1026,12 +1023,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Routing.git",
-                "reference": "d4d38ff20ed4f8d7a7b17f287021578225c925ed"
+                "reference": "474baf367fea8d357ac0044c2b5e7f1fa68122b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Routing/zipball/d4d38ff20ed4f8d7a7b17f287021578225c925ed",
-                "reference": "d4d38ff20ed4f8d7a7b17f287021578225c925ed",
+                "url": "https://api.github.com/repos/symfony/Routing/zipball/474baf367fea8d357ac0044c2b5e7f1fa68122b0",
+                "reference": "474baf367fea8d357ac0044c2b5e7f1fa68122b0",
                 "shasum": ""
             },
             "require": {
@@ -1072,24 +1069,24 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Routing Component",
-            "homepage": "http://symfony.com",
+            "homepage": "https://symfony.com",
             "keywords": [
                 "router",
                 "routing",
                 "uri",
                 "url"
             ],
-            "time": "2015-04-24 07:12:41"
+            "time": "2015-05-16 13:28:04"
         },
         {
             "name": "symfony/security-core",
@@ -1097,12 +1094,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/security-core.git",
-                "reference": "4fb4e88f50c0e13c571f12648e3a91f5841daec7"
+                "reference": "cf32ef36ed29872752b1537679201a3d51beaab2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/security-core/zipball/4fb4e88f50c0e13c571f12648e3a91f5841daec7",
-                "reference": "4fb4e88f50c0e13c571f12648e3a91f5841daec7",
+                "url": "https://api.github.com/repos/symfony/security-core/zipball/cf32ef36ed29872752b1537679201a3d51beaab2",
+                "reference": "cf32ef36ed29872752b1537679201a3d51beaab2",
                 "shasum": ""
             },
             "require": {
@@ -1139,18 +1136,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Security Component - Core Library",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-15 14:16:35"
         },
         {
             "name": "symfony/security-csrf",
@@ -1158,12 +1155,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/security-csrf.git",
-                "reference": "b3b8f4657d382c4edb170ddf47f4d72a7fe1a5cb"
+                "reference": "c7e3965b3564396d94d22ffc3937211776706c86"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/security-csrf/zipball/b3b8f4657d382c4edb170ddf47f4d72a7fe1a5cb",
-                "reference": "b3b8f4657d382c4edb170ddf47f4d72a7fe1a5cb",
+                "url": "https://api.github.com/repos/symfony/security-csrf/zipball/c7e3965b3564396d94d22ffc3937211776706c86",
+                "reference": "c7e3965b3564396d94d22ffc3937211776706c86",
                 "shasum": ""
             },
             "require": {
@@ -1193,18 +1190,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Security Component - CSRF Library",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-13 11:38:41"
         },
         {
             "name": "symfony/stopwatch",
@@ -1212,12 +1209,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Stopwatch.git",
-                "reference": "f869ed0da4102342f1a73eb60b5cdb18df849a86"
+                "reference": "e799eaa63b2008e18ffa905de5e9a1d31795955b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/f869ed0da4102342f1a73eb60b5cdb18df849a86",
-                "reference": "f869ed0da4102342f1a73eb60b5cdb18df849a86",
+                "url": "https://api.github.com/repos/symfony/Stopwatch/zipball/e799eaa63b2008e18ffa905de5e9a1d31795955b",
+                "reference": "e799eaa63b2008e18ffa905de5e9a1d31795955b",
                 "shasum": ""
             },
             "require": {
@@ -1242,18 +1239,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Stopwatch Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-12 15:48:43"
         },
         {
             "name": "symfony/templating",
@@ -1261,12 +1258,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Templating.git",
-                "reference": "373511d6b8fc199390f94ce81c4587eee03eeffe"
+                "reference": "838784e850e8dbbc87dc8a8d632661ef6f3da873"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Templating/zipball/373511d6b8fc199390f94ce81c4587eee03eeffe",
-                "reference": "373511d6b8fc199390f94ce81c4587eee03eeffe",
+                "url": "https://api.github.com/repos/symfony/Templating/zipball/838784e850e8dbbc87dc8a8d632661ef6f3da873",
+                "reference": "838784e850e8dbbc87dc8a8d632661ef6f3da873",
                 "shasum": ""
             },
             "require": {
@@ -1295,18 +1292,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Templating Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-12 15:48:43"
         },
         {
             "name": "symfony/translation",
@@ -1314,12 +1311,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Translation.git",
-                "reference": "6a4968a7ddc35ea421480194257be521f64d8968"
+                "reference": "3ba54181c8386b180999d942bf33681a726bb70f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Translation/zipball/6a4968a7ddc35ea421480194257be521f64d8968",
-                "reference": "6a4968a7ddc35ea421480194257be521f64d8968",
+                "url": "https://api.github.com/repos/symfony/Translation/zipball/3ba54181c8386b180999d942bf33681a726bb70f",
+                "reference": "3ba54181c8386b180999d942bf33681a726bb70f",
                 "shasum": ""
             },
             "require": {
@@ -1356,18 +1353,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Translation Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-16 13:28:04"
         },
         {
             "name": "twig/twig",
@@ -1375,12 +1372,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "206d54792002375a2d7a76f6988d21a064d133dd"
+                "reference": "dfddd2e0ef39fd39e201fd89f469769740d5a4a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/206d54792002375a2d7a76f6988d21a064d133dd",
-                "reference": "206d54792002375a2d7a76f6988d21a064d133dd",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/dfddd2e0ef39fd39e201fd89f469769740d5a4a1",
+                "reference": "dfddd2e0ef39fd39e201fd89f469769740d5a4a1",
                 "shasum": ""
             },
             "require": {
@@ -1424,7 +1421,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2015-05-07 15:16:34"
+            "time": "2015-06-02 14:50:15"
         }
     ],
     "packages-dev": [
@@ -1434,12 +1431,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/cache.git",
-                "reference": "c2ab51e8f3c4a8170ca91b702e3789881dd2a6c2"
+                "reference": "9930e3367777a8727e229f5126c5299890d700bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/c2ab51e8f3c4a8170ca91b702e3789881dd2a6c2",
-                "reference": "c2ab51e8f3c4a8170ca91b702e3789881dd2a6c2",
+                "url": "https://api.github.com/repos/doctrine/cache/zipball/9930e3367777a8727e229f5126c5299890d700bb",
+                "reference": "9930e3367777a8727e229f5126c5299890d700bb",
                 "shasum": ""
             },
             "require": {
@@ -1496,7 +1493,7 @@
                 "cache",
                 "caching"
             ],
-            "time": "2015-05-07 20:41:18"
+            "time": "2015-05-13 10:08:10"
         },
         {
             "name": "doctrine/instantiator",
@@ -1504,12 +1501,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "cd3fe91baa28da6e119d619612439eb2db0d8d88"
+                "reference": "b70d22758c0813ea5fef9c22480caadd3a2b6a56"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/cd3fe91baa28da6e119d619612439eb2db0d8d88",
-                "reference": "cd3fe91baa28da6e119d619612439eb2db0d8d88",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/b70d22758c0813ea5fef9c22480caadd3a2b6a56",
+                "reference": "b70d22758c0813ea5fef9c22480caadd3a2b6a56",
                 "shasum": ""
             },
             "require": {
@@ -1550,7 +1547,7 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-05-10 22:20:19"
+            "time": "2015-05-13 13:33:36"
         },
         {
             "name": "guzzlehttp/command",
@@ -1650,12 +1647,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "d1da796ba5565789a623052eb9f2cf59d57fec60"
+                "reference": "ae15da2ce234d3ffe5d7fafcdad19c7f1acf3568"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d1da796ba5565789a623052eb9f2cf59d57fec60",
-                "reference": "d1da796ba5565789a623052eb9f2cf59d57fec60",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/ae15da2ce234d3ffe5d7fafcdad19c7f1acf3568",
+                "reference": "ae15da2ce234d3ffe5d7fafcdad19c7f1acf3568",
                 "shasum": ""
             },
             "require": {
@@ -1665,7 +1662,6 @@
                 "phpunit/phpunit": "~4.0"
             },
             "suggest": {
-                "dflydev/markdown": "~1.0",
                 "erusev/parsedown": "~1.0",
                 "league/commonmark": "*"
             },
@@ -1692,7 +1688,7 @@
                     "email": "mike.vanriel@naenius.com"
                 }
             ],
-            "time": "2015-02-27 09:28:18"
+            "time": "2015-05-12 07:21:12"
         },
         {
             "name": "phpspec/prophecy",
@@ -1700,12 +1696,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373"
+                "reference": "5a355f91730c845301a9e28f91c8a5053353c496"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
-                "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/5a355f91730c845301a9e28f91c8a5053353c496",
+                "reference": "5a355f91730c845301a9e28f91c8a5053353c496",
                 "shasum": ""
             },
             "require": {
@@ -1752,20 +1748,20 @@
                 "spy",
                 "stub"
             ],
-            "time": "2015-04-27 22:15:08"
+            "time": "2015-05-20 16:00:43"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "dev-master",
+            "version": "2.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "9ef4b8cbf3e839a44a9b375d8c59e109ac7aa020"
+                "reference": "3b58cb7bc6d9be58ba35ba72a6e5c65ebb81687d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/9ef4b8cbf3e839a44a9b375d8c59e109ac7aa020",
-                "reference": "9ef4b8cbf3e839a44a9b375d8c59e109ac7aa020",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/3b58cb7bc6d9be58ba35ba72a6e5c65ebb81687d",
+                "reference": "3b58cb7bc6d9be58ba35ba72a6e5c65ebb81687d",
                 "shasum": ""
             },
             "require": {
@@ -1814,7 +1810,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-05-09 04:40:58"
+            "time": "2015-06-02 15:27:47"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -2006,12 +2002,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "13a957b45df0b04f2e3b1fabd4a83eb4e5e5046a"
+                "reference": "667aca34d1f1148da86a8ac3a8a841a8a92f933b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/13a957b45df0b04f2e3b1fabd4a83eb4e5e5046a",
-                "reference": "13a957b45df0b04f2e3b1fabd4a83eb4e5e5046a",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/667aca34d1f1148da86a8ac3a8a841a8a92f933b",
+                "reference": "667aca34d1f1148da86a8ac3a8a841a8a92f933b",
                 "shasum": ""
             },
             "require": {
@@ -2022,7 +2018,7 @@
                 "ext-spl": "*",
                 "php": ">=5.3.3",
                 "phpspec/prophecy": "~1.3,>=1.3.1",
-                "phpunit/php-code-coverage": "~2.0,>=2.0.11",
+                "phpunit/php-code-coverage": "~2.1",
                 "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
                 "phpunit/php-timer": "~1.0",
@@ -2070,7 +2066,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2015-04-29 13:03:58"
+            "time": "2015-06-02 07:10:31"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
@@ -2078,12 +2074,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "74ffb87f527f24616f72460e54b595f508dccb5c"
+                "reference": "253c005852591fd547fc18cd5b7b43a1ec82d8f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/74ffb87f527f24616f72460e54b595f508dccb5c",
-                "reference": "74ffb87f527f24616f72460e54b595f508dccb5c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/253c005852591fd547fc18cd5b7b43a1ec82d8f7",
+                "reference": "253c005852591fd547fc18cd5b7b43a1ec82d8f7",
                 "shasum": ""
             },
             "require": {
@@ -2125,7 +2121,7 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2015-04-02 05:36:41"
+            "time": "2015-05-29 05:19:18"
         },
         {
             "name": "sebastian/comparator",
@@ -2504,12 +2500,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "ed1915c6f41c375f050335273532b90227b04a78"
+                "reference": "242cbb7b4cb7b15c4987a59e85543bdfa8a4c720"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/ed1915c6f41c375f050335273532b90227b04a78",
-                "reference": "ed1915c6f41c375f050335273532b90227b04a78",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/242cbb7b4cb7b15c4987a59e85543bdfa8a4c720",
+                "reference": "242cbb7b4cb7b15c4987a59e85543bdfa8a4c720",
                 "shasum": ""
             },
             "require": {
@@ -2537,18 +2533,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Nicolas Grekas",
                     "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony PHPUnit Bridge",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-12 15:48:43"
         },
         {
             "name": "symfony/twig-bridge",
@@ -2556,12 +2552,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/TwigBridge.git",
-                "reference": "01b0d7a4051675b48c0ae6bcdf77c8fd9f3dc355"
+                "reference": "15809c48f53b928d3f8a95fe606e1f164aacc5a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/01b0d7a4051675b48c0ae6bcdf77c8fd9f3dc355",
-                "reference": "01b0d7a4051675b48c0ae6bcdf77c8fd9f3dc355",
+                "url": "https://api.github.com/repos/symfony/TwigBridge/zipball/15809c48f53b928d3f8a95fe606e1f164aacc5a5",
+                "reference": "15809c48f53b928d3f8a95fe606e1f164aacc5a5",
                 "shasum": ""
             },
             "require": {
@@ -2615,18 +2611,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Twig Bridge",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-15 14:16:35"
         },
         {
             "name": "symfony/web-profiler-bundle",
@@ -2634,12 +2630,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/WebProfilerBundle.git",
-                "reference": "58986a40b5649e920ff95039212787e93fd4ff48"
+                "reference": "4afd87d54b351481478d10fd7db314a13a45d210"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/WebProfilerBundle/zipball/58986a40b5649e920ff95039212787e93fd4ff48",
-                "reference": "58986a40b5649e920ff95039212787e93fd4ff48",
+                "url": "https://api.github.com/repos/symfony/WebProfilerBundle/zipball/4afd87d54b351481478d10fd7db314a13a45d210",
+                "reference": "4afd87d54b351481478d10fd7db314a13a45d210",
                 "shasum": ""
             },
             "require": {
@@ -2671,18 +2667,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony WebProfilerBundle",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:03:44"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-17 02:16:55"
         },
         {
             "name": "symfony/yaml",
@@ -2690,12 +2686,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/Yaml.git",
-                "reference": "70d4fb2d28a8cef5472b934ee64459f18d99ca5d"
+                "reference": "28a6a5c1ac255efbc167d273530c66dcea94e13f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Yaml/zipball/70d4fb2d28a8cef5472b934ee64459f18d99ca5d",
-                "reference": "70d4fb2d28a8cef5472b934ee64459f18d99ca5d",
+                "url": "https://api.github.com/repos/symfony/Yaml/zipball/28a6a5c1ac255efbc167d273530c66dcea94e13f",
+                "reference": "28a6a5c1ac255efbc167d273530c66dcea94e13f",
                 "shasum": ""
             },
             "require": {
@@ -2720,18 +2716,18 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
                 {
                     "name": "Fabien Potencier",
                     "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony Yaml Component",
-            "homepage": "http://symfony.com",
-            "time": "2015-04-24 07:12:41"
+            "homepage": "https://symfony.com",
+            "time": "2015-05-12 15:48:43"
         }
     ],
     "aliases": [],
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 5c2e37a2..2e1f6e3e 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -124,7 +124,7 @@ private function createCacheNode()
             ->end()
             ->validate()
                 ->ifTrue(function ($v) {
-                    return null === $v['service'] && null === $v['adapter']['service'];
+                    return $v['enabled'] && null === $v['service'] && null === $v['adapter']['service'];
                 })
                 ->thenInvalid('The csa_guzzle.cache.adapter key should be configured.')
             ->end()
diff --git a/src/Factory/ClientFactory.php b/src/Factory/ClientFactory.php
index 85503685..6b907942 100644
--- a/src/Factory/ClientFactory.php
+++ b/src/Factory/ClientFactory.php
@@ -11,6 +11,7 @@
 
 namespace Csa\Bundle\GuzzleBundle\Factory;
 
+use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Event\HasEmitterInterface;
 use GuzzleHttp\Event\SubscriberInterface;
 
@@ -36,8 +37,17 @@ public function __construct($class)
         $this->clientOptions = [];
     }
 
+    /**
+     * Creates a Guzzle client
+     *
+     * @param array $options
+     * @param array $subscribers
+     *
+     * @return ClientInterface
+     */
     public function create(array $options = [], array $subscribers = [])
     {
+        trigger_error('The ClientFactory class is deprecated since version 1.3 and will be removed in 2.0. Use the \`csa_guzzle.client\` tag instead', E_USER_DEPRECATED);
         $client = new $this->class($options);
 
         if ($client instanceof HasEmitterInterface) {
@@ -53,6 +63,7 @@ public function create(array $options = [], array $subscribers = [])
 
     public function registerSubscriber($name, SubscriberInterface $subscriber)
     {
+        trigger_error('The ClientFactory class is deprecated since version 1.3 and will be removed in 2.0. Use the \`csa_guzzle.client\` tag instead', E_USER_DEPRECATED);
         $this->subscribers[$name] = $subscriber;
     }
 }
diff --git a/src/Tests/DependencyInjection/CsaGuzzleExtensionTest.php b/src/Tests/DependencyInjection/CsaGuzzleExtensionTest.php
index 57885f10..80167f89 100644
--- a/src/Tests/DependencyInjection/CsaGuzzleExtensionTest.php
+++ b/src/Tests/DependencyInjection/CsaGuzzleExtensionTest.php
@@ -9,11 +9,13 @@
  * file that was distributed with this source code
  */
 
-namespace Csa\Bundle\GuzzleBundle\DependencyInjection;
+namespace Csa\Bundle\GuzzleBundle\Tests\DependencyInjection;
 
 use Csa\Bundle\GuzzleBundle\DependencyInjection\CompilerPass\SubscriberPass;
 use Csa\Bundle\GuzzleBundle\DependencyInjection\CsaGuzzleExtension;
+use GuzzleHttp\Subscriber\Log\Formatter;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\Yaml\Parser;
 
 class CsaGuzzleExtensionTest extends \PHPUnit_Framework_TestCase
@@ -47,6 +49,21 @@ public function testClientCreated()
         );
     }
 
+    public function testClientWithDescription()
+    {
+        $yaml = <<<YAML
+clients:
+    foo:
+        config: { base_url: example.com }
+        description: %s
+YAML;
+
+        $container = $this->createContainer(sprintf($yaml, realpath(__DIR__ . '/../Fixtures/github.description.json')));
+        $this->assertTrue($container->hasDefinition('csa_guzzle.service.foo'));
+        $this->assertSame('csa_guzzle.client.foo', (string)$container->getDefinition('csa_guzzle.service.foo')->getArgument(0));
+        $this->assertSame('service("csa_guzzle.description_factory").getDescription("foo")', (string)$container->getDefinition('csa_guzzle.service.foo')->getArgument(1));
+    }
+
     public function testSubscribersAddedToClient()
     {
         $yaml = <<<YAML
@@ -72,6 +89,82 @@ public function testSubscribersAddedToClient()
         );
     }
 
+    public function testLoggerConfiguration()
+    {
+        $yaml = <<<YAML
+logger:
+    enabled: true
+    service: monolog.logger
+    format: %s
+YAML;
+        $formats = ['clf' => Formatter::CLF, 'debug' => Formatter::DEBUG, 'short' => Formatter::SHORT];
+
+        foreach ($formats as $alias => $format) {
+            $container = $this->createContainer(sprintf($yaml, $alias));
+
+            $this->assertSame($format, $container->getDefinition('csa_guzzle.subscriber.logger')->getArgument(1));
+            $this->assertSame('monolog.logger', (string)$container->getDefinition('csa_guzzle.subscriber.logger')->getArgument(0));
+        }
+
+        $yaml = <<<YAML
+logger: false
+YAML;
+
+        $container = $this->createContainer($yaml);
+        $this->assertFalse($container->hasDefinition('csa_guzzle.subscriber.logger'));
+    }
+
+    public function testCacheConfiguration()
+    {
+        $yaml = <<<YAML
+cache: false
+YAML;
+
+        $container = $this->createContainer($yaml);
+        $this->assertFalse($container->hasDefinition('csa_guzzle.subscriber.cache'));
+
+        $yaml = <<<YAML
+cache:
+    enabled: true
+    adapter: my.adapter.id
+YAML;
+
+        $container = $this->createContainer($yaml);
+        $container->setDefinition('my.adapter.id', new Definition());
+        $alias = $container->getAlias('csa_guzzle.default_cache_adapter');
+        $this->assertSame('my.adapter.id', (string)$alias);
+    }
+
+    public function testLegacyCacheConfiguration()
+    {
+        $yaml = <<<YAML
+cache:
+    enabled: true
+    service: my.service.id
+YAML;
+
+        $container = $this->createContainer($yaml);
+        $container->setDefinition('my.service.id', new Definition(null, [null, null]));
+        $alias = $container->getAlias('csa_guzzle.default_cache_adapter');
+        $this->assertSame('my.service.id', (string)$container->getDefinition((string) $alias)->getArgument(0));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage Invalid configuration for path "csa_guzzle.cache.adapter.type": Invalid cache adapter
+     */
+    public function testLegacyWrongCacheAdapterTypeThrowsException()
+    {
+        $yaml = <<<YAML
+cache:
+    enabled: true
+    adapter:
+        type: foo
+YAML;
+
+        $this->createContainer($yaml);
+    }
+
     private function createContainer($yaml)
     {
         $parser = new Parser();
diff --git a/src/Tests/Factory/ClientFactoryTest.php b/src/Tests/Factory/ClientFactoryTest.php
index 1e2f2589..98ba3148 100644
--- a/src/Tests/Factory/ClientFactoryTest.php
+++ b/src/Tests/Factory/ClientFactoryTest.php
@@ -6,11 +6,11 @@
 
 /**
  * ClientTest
+ *
+ * @group legacy
  */
 class ClientFactoryTest extends \PHPUnit_Framework_TestCase
 {
-    /**
-     */
     public function testCreateClient()
     {
         $factory = new ClientFactory('GuzzleHttp\Client');
diff --git a/src/Tests/Fixtures/github.description.json b/src/Tests/Fixtures/github.description.json
new file mode 100644
index 00000000..ccc52a4d
--- /dev/null
+++ b/src/Tests/Fixtures/github.description.json
@@ -0,0 +1,216 @@
+{
+  "name": "Github API",
+  "description": "basic use of the github API",
+  "operations": {
+    "getUser": {
+      "httpMethod": "GET",
+      "uri": "/users/{username}",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "username": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        }
+      }
+    },
+    "getUsers": {
+      "httpMethod": "GET",
+      "uri": "\/users",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "since": {
+          "type": "integer",
+          "location": "query"
+        }
+      }
+    },
+    "getUserRepositories": {
+      "httpMethod": "GET",
+      "uri": "/users/{username}/repos",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "username": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        },
+        "type": {
+          "type": "string",
+          "location": "query"
+        },
+        "sort": {
+          "type": "string",
+          "location": "query"
+        },
+        "direction": {
+          "type": "string",
+          "location": "query"
+        }
+      }
+    },
+    "getOrgRepositories": {
+      "httpMethod": "GET",
+      "uri": "/orgs/{org}/repos",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "org": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        },
+        "type": {
+          "type": "string",
+          "location": "query"
+        }
+      }
+    },
+    "getRepositories": {
+      "httpMethod": "GET",
+      "uri": "\/repositories",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "since": {
+          "type": "integer",
+          "location": "query"
+        }
+      }
+    },
+    "getRepository": {
+      "httpMethod": "GET",
+      "uri": "/repos/{owner}/{repo}",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "owner": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        },
+        "repo": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        }
+      }
+    },
+    "getRepositoryContributors": {
+      "httpMethod": "GET",
+      "uri": "/repos/{owner}/{repo}/contributors",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "owner": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        },
+        "repo": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        },
+        "anon": {
+          "type": "boolean",
+          "location": "query"
+        }
+      }
+    },
+    "getRepositoryLanguages": {
+      "httpMethod": "GET",
+      "uri": "/repos/{owner}/{repo}/languages",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "owner": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        },
+        "repo": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        }
+      }
+    },
+    "getRepositoryTeams": {
+      "httpMethod": "GET",
+      "uri": "/repos/{owner}/{repo}/teams",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "owner": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        },
+        "repo": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        }
+      }
+    },
+    "getRepositoryTags": {
+      "httpMethod": "GET",
+      "uri": "/repos/{owner}/{repo}/tags",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "owner": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        },
+        "repo": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        }
+      }
+    },
+    "getRepositoryBranches": {
+      "httpMethod": "GET",
+      "uri": "/repos/{owner}/{repo}/branches",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "owner": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        },
+        "repo": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        }
+      }
+    },
+    "getRepositoryBranch": {
+      "httpMethod": "GET",
+      "uri": "/repos/{owner}/{repo}/branches/{branch}",
+      "responseModel": "jsonResponse",
+      "parameters": {
+        "owner": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        },
+        "repo": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        },
+        "branch": {
+          "required": true,
+          "type": "string",
+          "location": "uri"
+        }
+      }
+    }
+  },
+  "models": {
+    "jsonResponse": {
+      "type": "object",
+      "additionalProperties": {
+        "location": "json"
+      }
+    }
+  }
+}

From 145deac41e74c932d4bf1028359a2bfaedf017d4 Mon Sep 17 00:00:00 2001
From: Charles Sarrazin <charles@sarraz.in>
Date: Thu, 4 Jun 2015 09:18:48 +0200
Subject: [PATCH 8/8] Added more tests

---
 .../DataCollector/GuzzleCollectorTest.php     |  3 +
 .../GuzzleHttp/Cache/DoctrineAdapterTest.php  | 73 +++++++++++++++++++
 .../Subscriber/CacheSubscriberTest.php        | 59 +++++++++++++++
 3 files changed, 135 insertions(+)
 create mode 100644 src/Tests/GuzzleHttp/Cache/DoctrineAdapterTest.php
 create mode 100644 src/Tests/GuzzleHttp/Subscriber/CacheSubscriberTest.php

diff --git a/src/Tests/DataCollector/GuzzleCollectorTest.php b/src/Tests/DataCollector/GuzzleCollectorTest.php
index f4a9b0ff..1210216d 100644
--- a/src/Tests/DataCollector/GuzzleCollectorTest.php
+++ b/src/Tests/DataCollector/GuzzleCollectorTest.php
@@ -9,6 +9,9 @@
 use GuzzleHttp\Subscriber\Mock;
 use Symfony\Component\HttpFoundation\Request;
 
+/**
+ * @covers Csa\Bundle\GuzzleBundle\DataCollector\GuzzleCollector
+ */
 class GuzzleCollectorTest extends \PHPUnit_Framework_TestCase
 {
     public function testCollect()
diff --git a/src/Tests/GuzzleHttp/Cache/DoctrineAdapterTest.php b/src/Tests/GuzzleHttp/Cache/DoctrineAdapterTest.php
new file mode 100644
index 00000000..4f52b9f3
--- /dev/null
+++ b/src/Tests/GuzzleHttp/Cache/DoctrineAdapterTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the CsaGuzzleBundle package
+ *
+ * (c) Charles Sarrazin <charles@sarraz.in>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code
+ */
+
+namespace Csa\Bundle\GuzzleBundle\Tests\GuzzleHttp\Cache;
+
+use Csa\Bundle\GuzzleBundle\GuzzleHttp\Cache\DoctrineAdapter;
+use GuzzleHttp\Message\Request;
+
+class DoctrineAdapterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testConstructor()
+    {
+        $cache = $this->getMock('Doctrine\Common\Cache\Cache');
+        new DoctrineAdapter($cache, 0);
+    }
+
+    public function testFetch()
+    {
+        $cache = $this->getMock('Doctrine\Common\Cache\Cache');
+
+        $cache
+            ->expects($this->at(0))
+            ->method('contains')
+            ->willReturn(false)
+        ;
+        $cache
+            ->expects($this->at(1))
+            ->method('contains')
+            ->willReturn(true)
+        ;
+        $cache
+            ->expects($this->at(2))
+            ->method('fetch')
+            ->willReturn($this->getMock('GuzzleHttp\Message\ResponseInterface'))
+        ;
+        $adapter = new DoctrineAdapter($cache, 0);
+
+        $request = $this->getRequestMock();
+
+        $this->assertNull($adapter->fetch($request));
+        $this->assertInstanceOf('GuzzleHttp\Message\ResponseInterface', $adapter->fetch($request));
+    }
+
+    public function testSave()
+    {
+        $cache = $this->getMock('Doctrine\Common\Cache\Cache');
+
+        $cache
+            ->expects($this->at(0))
+            ->method('save')
+            ->with(
+                $this->isType('string'),
+                $this->isInstanceOf('GuzzleHttp\Message\ResponseInterface'),
+                10
+            );
+        ;
+        $adapter = new DoctrineAdapter($cache, 10);
+        $this->assertNull($adapter->save($this->getRequestMock(), $this->getMock('GuzzleHttp\Message\ResponseInterface')));
+    }
+
+    private function getRequestMock()
+    {
+        return new Request('GET', 'http://google.com/', array('Accept' => 'text/html'), $this->getMock('GuzzleHttp\Stream\StreamInterface'));
+    }
+}
diff --git a/src/Tests/GuzzleHttp/Subscriber/CacheSubscriberTest.php b/src/Tests/GuzzleHttp/Subscriber/CacheSubscriberTest.php
new file mode 100644
index 00000000..08232ae6
--- /dev/null
+++ b/src/Tests/GuzzleHttp/Subscriber/CacheSubscriberTest.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the CsaGuzzleBundle package
+ *
+ * (c) Charles Sarrazin <charles@sarraz.in>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code
+ */
+
+namespace Csa\Bundle\GuzzleBundle\Tests\GuzzleHttp\Subscriber;
+
+use Csa\Bundle\GuzzleBundle\GuzzleHttp\Subscriber\CacheSubscriber;
+use GuzzleHttp\Client;
+use GuzzleHttp\Message\Response;
+use GuzzleHttp\Subscriber\Mock;
+
+class DoctrineAdapterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testFetch()
+    {
+        $response = new Response(204);
+        $mocks = array_fill(0, 2, $response);
+
+        $mockSubscriber = new Mock($mocks);
+        $adapter = $this->getMock('Csa\Bundle\GuzzleBundle\GuzzleHttp\Cache\StorageAdapterInterface');
+        $adapter
+            ->expects($this->at(0))
+            ->method('fetch')
+            ->with($this->isInstanceOf('GuzzleHttp\Message\Request'))
+            ->willReturn(false)
+        ;
+        $adapter
+            ->expects($this->at(1))
+            ->method('save')
+            ->with(
+                $this->isInstanceOf('GuzzleHttp\Message\RequestInterface'),
+                $this->equalTo($response),
+                $this->isType('array')
+            )
+        ;
+        $adapter
+            ->expects($this->at(2))
+            ->method('fetch')
+            ->with($this->isInstanceOf('GuzzleHttp\Message\RequestInterface'))
+            ->willReturn($response)
+        ;
+        $cacheSubscriber = new CacheSubscriber($adapter);
+
+        $client = new Client();
+        $client->getEmitter()->attach($mockSubscriber);
+        $client->getEmitter()->attach($cacheSubscriber);
+
+        $client->get('http://foo.bar');
+
+        $client->get('http://foo.bar');
+    }
+}