Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #332 from FriendsOfSymfony/jms_serlializer_1_0

[WIP] JMSSerializerBundle 1.0 compatibility
  • Loading branch information...
commit fc92b764038d662542c9424aeaf60373bf3b6e32 2 parents 98a43ae + 0be73b0
Lukas Kahwe Smith lsmith77 authored
1  .travis.yml
View
@@ -5,7 +5,6 @@ php:
- 5.4
env:
- - SYMFONY_VERSION=2.0.*
- SYMFONY_VERSION=2.1.*
- SYMFONY_VERSION=dev-master
2  Tests/View/ViewHandlerTest.php
View
@@ -150,7 +150,7 @@ public function testCreateResponseWithoutLocation($format, $expected, $createVie
->with('fos_rest.templating')
->will($this->returnValue($templating));
} else {
- $serializer = $this->getMockBuilder('\JMS\SerializerBundle\Serializer\Serializer')
+ $serializer = $this->getMockBuilder('\JMS\Serializer\Serializer')
->setMethods(array('serialize', 'setExclusionStrategy'))
->disableOriginalConstructor()
->getMock();
4 UPGRADING.md
View
@@ -4,6 +4,10 @@ Upgrading
Note as FOSRestBundle is not yet declared stable, this document will be updated to
list important BC breaks.
+### upgrading from 0.10.0
+
+* now requires JMSSerializerBundle 1.0 which is not compatible with Symfony2.0
+
### upgrading from 0.9.0
* the view response listener is now disabled by default. See [enable view listener](https://github.com/FriendsOfSymfony/FOSRestBundle/blob/master/Resources/doc/3-listener-support.md#view-response-listener) for how to enable it.
10 View/GroupsVersionExclusionStrategy.php
View
@@ -11,11 +11,11 @@
namespace FOS\RestBundle\View;
-use JMS\SerializerBundle\Metadata\ClassMetadata;
-use JMS\SerializerBundle\Metadata\PropertyMetadata;
-use JMS\SerializerBundle\Serializer\Exclusion\ExclusionStrategyInterface;
-use JMS\SerializerBundle\Serializer\Exclusion\VersionExclusionStrategy;
-use JMS\SerializerBundle\Serializer\Exclusion\GroupsExclusionStrategy;
+use JMS\Serializer\Metadata\ClassMetadata;
+use JMS\Serializer\Metadata\PropertyMetadata;
+use JMS\Serializer\Exclusion\ExclusionStrategyInterface;
+use JMS\Serializer\Exclusion\VersionExclusionStrategy;
+use JMS\Serializer\Exclusion\GroupsExclusionStrategy;
class GroupsVersionExclusionStrategy implements ExclusionStrategyInterface
{
2  View/View.php
View
@@ -193,7 +193,7 @@ public function setSerializerGroups($serializerGroups)
/**
* set the serializer callback
*
- * function (\FOS\RestBundle\View\ViewHandler $viewHandler, \JMS\SerializerBundle\Serializer\SerializerInterface $serializer) { .. }
+ * function (\FOS\RestBundle\View\ViewHandler $viewHandler, \JMS\Serializer\SerializerInterface $serializer) { .. }
*
* @param callable $serializerCallback
* @return View
2  View/ViewHandler.php
View
@@ -12,7 +12,7 @@
namespace FOS\RestBundle\View;
use Symfony\Component\HttpFoundation\RedirectResponse;
-use JMS\SerializerBundle\Serializer\Serializer;
+use JMS\Serializer\Serializer;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\HttpException;
16 composer.json
View
@@ -28,16 +28,16 @@
},
"require-dev": {
- "sensio/framework-extra-bundle": ">=2.0,<2.3-dev",
- "symfony/form": ">=2.0,<2.3-dev",
- "symfony/yaml": ">=2.0,<2.3-dev",
- "symfony/security": ">=2.0,<2.3-dev",
- "jms/serializer-bundle": ">=0.9,<=0.10"
+ "sensio/framework-extra-bundle": ">=2.1,<2.3-dev",
+ "symfony/form": ">=2.1,<2.3-dev",
+ "symfony/yaml": ">=2.1,<2.3-dev",
+ "symfony/security": ">=2.1,<2.3-dev",
+ "jms/serializer-bundle": "1.0.*"
},
"suggest": {
- "sensio/framework-extra-bundle": "Add support for route annotations",
- "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires >=0.9,<=0.10",
+ "sensio/framework-extra-bundle": "Add support for route annotations and the view response listener",
+ "jms/serializer-bundle": "Add support for advanced serialization capabilities, recommended, requires 1.0.*",
"symfony/serializer": "Add support for basic serialization capabilities, requires >=2.0,<2.3-dev"
},
@@ -49,7 +49,7 @@
"extra": {
"branch-alias": {
- "dev-master": "0.10.x-dev"
+ "dev-master": "0.11.x-dev"
}
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.