From befeeb3e3fd15b36530a51bf1980bb14df8b9338 Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Mon, 3 Dec 2012 16:32:15 +0100
Subject: [PATCH] JMSSerializerBundle 1.0 compatibility

---
 Parser/JmsMetadataParser.php       | 4 ++--
 Tests/Fixtures/Model/JmsNested.php | 2 +-
 Tests/Fixtures/Model/JmsTest.php   | 2 +-
 composer.json                      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Parser/JmsMetadataParser.php b/Parser/JmsMetadataParser.php
index 1f4664f..73ef591 100644
--- a/Parser/JmsMetadataParser.php
+++ b/Parser/JmsMetadataParser.php
@@ -13,8 +13,8 @@ namespace Nelmio\ApiDocBundle\Parser;
 
 use Metadata\MetadataFactoryInterface;
 use Nelmio\ApiDocBundle\Util\DocCommentExtractor;
-use JMS\SerializerBundle\Metadata\PropertyMetadata;
-use JMS\SerializerBundle\Metadata\VirtualPropertyMetadata;
+use JMS\Serializer\Metadata\PropertyMetadata;
+use JMS\Serializer\Metadata\VirtualPropertyMetadata;
 
 /**
  * Uses the JMS metadata factory to extract input/output model information
diff --git a/Tests/Fixtures/Model/JmsNested.php b/Tests/Fixtures/Model/JmsNested.php
index ad29652..90b0348 100644
--- a/Tests/Fixtures/Model/JmsNested.php
+++ b/Tests/Fixtures/Model/JmsNested.php
@@ -1,7 +1,7 @@
 <?php
 namespace Nelmio\ApiDocBundle\Tests\Fixtures\Model;
 
-use JMS\SerializerBundle\Annotation as JMS;
+use JMS\Serializer\Annotation as JMS;
 
 class JmsNested
 {
diff --git a/Tests/Fixtures/Model/JmsTest.php b/Tests/Fixtures/Model/JmsTest.php
index d47741c..a2ce4d2 100644
--- a/Tests/Fixtures/Model/JmsTest.php
+++ b/Tests/Fixtures/Model/JmsTest.php
@@ -2,7 +2,7 @@
 
 namespace Nelmio\ApiDocBundle\Tests\Fixtures\Model;
 
-use JMS\SerializerBundle\Annotation as JMS;
+use JMS\Serializer\Annotation as JMS;
 
 class JmsTest
 {
diff --git a/composer.json b/composer.json
index d69968d..9779b6a 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,8 @@
         "symfony/browser-kit": ">=2.1,<2.3-dev",
         "symfony/validator": ">=2.1,<2.3-dev",
         "symfony/yaml": ">=2.1,<2.3-dev",
-        "friendsofsymfony/rest-bundle": "dev-master",
-        "jms/serializer-bundle": "0.9.*"
+        "friendsofsymfony/rest-bundle": "dev-jms_serlializer_1_0",
+        "jms/serializer-bundle": "1.0.*"
     },
     "minimum-stability": "dev",
     "autoload": {