Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Survos/PropelBundle
base: 62ca693235
...
head fork: Survos/PropelBundle
compare: f0aa2c8c13
  • 4 commits
  • 4 files changed
  • 0 commit comments
  • 3 contributors
Commits on Dec 05, 2013
Charles Sanquer fix Sensio FrameworkExtraBundle v3.0 ParamConverterInterface compatib…
…iltiy
e6afb74
@havvg havvg Merge pull request #259 from csanquer/1.4
fix Sensio FrameworkExtraBundle v3.0 ParamConverterInterface compatibility
b16659a
Commits on Dec 09, 2013
@kcivey kcivey revert addition of "conflict" to composer.json (not needed now that w…
…e are switching to 1.4)

Revert "Merge branch '1.2' into survos"

This reverts commit 62ca693, reversing
changes made to a95b42c.
96416e9
@kcivey kcivey Merge branch '1.4' into survos f0aa2c8
View
3  .travis.yml
@@ -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
6 README.markdown
@@ -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.
View
9 Request/ParamConverter/PropelParamConverter.php
@@ -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,7 +64,7 @@ public function setRouter(RouterInterface $router = null)
/**
* @param Request $request
- * @param ConfigurationInterface $configuration
+ * @param ParamConverter $configuration
*
* @return bool
*
@@ -73,7 +72,7 @@ public function setRouter(RouterInterface $router = null)
* @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
7 composer.json
@@ -9,16 +9,13 @@
"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"
},
- "conflict": {
- "sensio/framework-extra-bundle": ">=2.4"
- },
"autoload": {
"psr-0": { "Propel\\PropelBundle": "" }
},

No commit comments for this range

Something went wrong with that request. Please try again.