Permalink
Browse files

fix Sensio FrameworkExtraBundle v3.0 ParamConverterInterface compatib…

…iltiy
  • Loading branch information...
1 parent 967bc87 commit e6afb74564a5cb0aab7465387753200fd0e624d2 Charles Sanquer committed Dec 5, 2013
Showing with 11 additions and 11 deletions.
  1. +1 −2 .travis.yml
  2. +4 −2 README.markdown
  3. +4 −5 Request/ParamConverter/PropelParamConverter.php
  4. +2 −2 composer.json
View
@@ -6,8 +6,7 @@ php:
- 5.5
env:
- - SYMFONY_VERSION=2.2.*
- - SYMFONY_VERSION=2.3.*
+ - SYMFONY_VERSION=2.4.*
- SYMFONY_VERSION=dev-master
matrix:
View
@@ -11,14 +11,16 @@ As `Propel2` will be released in the near future, we are migrating the branching
* The `1.0` branch contains Propel *1.6* integration for Symfony *2.0* (*currently 2.0 branch*).
* The `1.1` branch contains Propel *1.6* integration for Symfony *2.1* (*currently 2.1 branch*).
-* The `1.2` branch contains Propel *1.6* integration for Symfony *>2.1* (*currently 2.2, 2.3 and 2.4 branch*).
+* The `1.2` branch contains Propel *1.6* integration for Symfony *>2.1* (*currently 2.2 and 2.3 *).
+* The `1.4` branch contains Propel *1.6* integration for Symfony *>2.3* (*currently 2.4 and master branch*).
* The `2.0` branch will contain `Propel2` integration for Symfony *2.1*.
We are still considering to integrate `Propel2` with Symfony *2.0*.
In case, we will do so, there will be a `2.1` and `2.0` branch integrating the respective Symfony version!
**The 1.x branches are already available and you are encouraged to migrate your dependencies according to the listings!**
-* If you depend on Symfony `2.2`, `2.3` or `master` branch, switch to the `1.2` branch.
+* If you depend on Symfony `2.4` or `master` branch, switch to the `1.4` branch.
+* If you depend on Symfony `2.2` or `2.3` branch, switch to the `1.2` branch.
* If you depend on Symfony `2.1` branch, switch to the `1.1` branch.
* If you depend on Symfony `2.0` branch, switch to the `1.0` branch.
@@ -3,7 +3,6 @@
namespace Propel\PropelBundle\Request\ParamConverter;
use Propel\PropelBundle\Util\PropelInflector;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\ConfigurationInterface;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@@ -65,15 +64,15 @@ public function setRouter(RouterInterface $router = null)
/**
* @param Request $request
- * @param ConfigurationInterface $configuration
+ * @param ParamConverter $configuration
*
* @return bool
*
* @throws \LogicException
* @throws NotFoundHttpException
* @throws \Exception
*/
- public function apply(Request $request, ConfigurationInterface $configuration)
+ public function apply(Request $request, ParamConverter $configuration)
{
$classQuery = $configuration->getClass() . 'Query';
$classPeer = $configuration->getClass() . 'Peer';
@@ -142,11 +141,11 @@ public function apply(Request $request, ConfigurationInterface $configuration)
}
/**
- * @param ConfigurationInterface $configuration
+ * @param ParamConverter $configuration
*
* @return bool
*/
- public function supports(ConfigurationInterface $configuration)
+ public function supports(ParamConverter $configuration)
{
if (null === ($classname = $configuration->getClass())) {
return false;
View
@@ -9,11 +9,11 @@
"email": "william.durand1@gmail.com"
}],
"require": {
- "symfony/symfony": "~2.2",
+ "symfony/symfony": "~2.4",
"propel/propel1": "~1.6"
},
"require-dev": {
- "sensio/framework-extra-bundle": "~2.2",
+ "sensio/framework-extra-bundle": "~3.0",
"fzaninotto/faker": "dev-master"
},
"autoload": {

0 comments on commit e6afb74

Please sign in to comment.