From 6c87b237cc561d31429eb7401ed2f7bff190b445 Mon Sep 17 00:00:00 2001
From: Christophe VERGNE <christophe.vergne@gmail.com>
Date: Wed, 12 Aug 2015 12:04:24 +0200
Subject: [PATCH] Update dependencies requirement + Fix ParamConverter

* Update dependencies requirement (Framework Extra Bundle version +
Twig Extensions)
* Fix ParamConverter use to be compliant with Framework Extra Bundle >=
3.0
---
 composer.json                                              | 4 +++-
 .../AppBundle/Request/ParamConverter/PumParamConverter.php | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 31bac78a..fecd130f 100644
--- a/composer.json
+++ b/composer.json
@@ -10,12 +10,14 @@
     "require": {
         "php": ">=5.3.3",
         "symfony/symfony": "~2.6",
+        "sensio/framework-extra-bundle": "~3.0",
         "doctrine/orm": ">=2.4.1",
         "pagerfanta/pagerfanta": "~1.0",
         "imagine/imagine": "0.5.*",
         "elasticsearch/elasticsearch": "~0.4",
         "guzzlehttp/guzzle": "4.*",
-        "twig/twig": "~1.16"
+        "twig/twig": "~1.16",
+        "twig/extensions": "~1.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~3.7"
diff --git a/src/Pum/Bundle/AppBundle/Request/ParamConverter/PumParamConverter.php b/src/Pum/Bundle/AppBundle/Request/ParamConverter/PumParamConverter.php
index 9601c903..67f23911 100644
--- a/src/Pum/Bundle/AppBundle/Request/ParamConverter/PumParamConverter.php
+++ b/src/Pum/Bundle/AppBundle/Request/ParamConverter/PumParamConverter.php
@@ -7,7 +7,6 @@
 use Pum\Core\Definition\ObjectDefinition;
 use Pum\Core\Definition\Project;
 use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ConfigurationInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -32,10 +31,10 @@ public function __construct(ObjectFactory $objectFactory)
 
     /**
      * @{inheritdoc}
-     * 
+     *
      * @throws NotFoundHttpException When invalid object given
      */
-    public function apply(Request $request, ConfigurationInterface $configuration)
+    public function apply(Request $request, ParamConverter $configuration)
     {
         $object       = null;
         $name         = $configuration->getName();
@@ -79,7 +78,7 @@ public function apply(Request $request, ConfigurationInterface $configuration)
     /**
      * @{inheritdoc}
      */
-    public function supports(ConfigurationInterface $configuration)
+    public function supports(ParamConverter $configuration)
     {
         if (null === $configuration->getClass()) {
             return false;