updated to latest changes

Metadata/Driver/AnnotationDriver.php

@@ -18,8 +18,7 @@
 
 namespace JMS\SerializerBundle\Metadata\Driver;
 
-use Annotations\ReaderInterface;
-use Metadata\Driver\DriverInterface;
+use Doctrine\Common\Annotations\Reader;
 use JMS\SerializerBundle\Annotation\Type;
 use JMS\SerializerBundle\Annotation\Exclude;
 use JMS\SerializerBundle\Annotation\Expose;
@@ -29,12 +28,13 @@ use JMS\SerializerBundle\Annotation\Since;
 use JMS\SerializerBundle\Annotation\ExclusionPolicy;
 use JMS\SerializerBundle\Metadata\ClassMetadata;
 use JMS\SerializerBundle\Metadata\PropertyMetadata;
+use Metadata\Driver\DriverInterface;
 
 class AnnotationDriver implements DriverInterface
 {
     private $reader;
 
-    public function __construct(ReaderInterface $reader)
+    public function __construct(Reader $reader)
     {
         $this->reader = $reader;
     }

Tests/DependencyInjection/JMSSerializerExtensionTest.php

@@ -2,11 +2,12 @@
 
 namespace JMS\SerializerBundle\Tests\DependencyInjection;
 
-use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
+use Doctrine\Common\Annotations\AnnotationReader;
 
+use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
 use JMS\SerializerBundle\JMSSerializerBundle;
 
-use Annotations\Reader;
+use Doctrine\Common\Annotations\Reader;
 
 use JMS\SerializerBundle\Tests\Fixtures\VersionedObject;
 
@@ -39,7 +40,7 @@ class JMSSerializerExtensionTest extends \PHPUnit_Framework_TestCase
         $container = new ContainerBuilder();
         $container->setParameter('kernel.debug', true);
         $container->setParameter('kernel.cache_dir', sys_get_temp_dir());
-        $container->set('annotation_reader', new Reader());
+        $container->set('annotation_reader', new AnnotationReader());
         $container->set('service_container', $container);
         $extension->load(array(array(
             'versions' => array('0.0.1', '1.1.1'),

Tests/PerformanceTest.php

@@ -2,21 +2,15 @@
 
 namespace JMS\SerializerBundle\Tests;
 
+use Doctrine\Common\Annotations\AnnotationReader;
 use JMS\SerializerBundle\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Compiler\ResolveDefinitionTemplatesPass;
-
 use JMS\SerializerBundle\JMSSerializerBundle;
-
 use JMS\SerializerBundle\DependencyInjection\JMSSerializerExtension;
-
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-
 use JMS\SerializerBundle\Tests\Fixtures\Comment;
-
 use JMS\SerializerBundle\Tests\Fixtures\Author;
-
 use JMS\SerializerBundle\Tests\Fixtures\BlogPost;
-use Annotations\Reader;
 use JMS\SerializerBundle\Serializer\Exclusion\NoneExclusionStrategy;
 use JMS\SerializerBundle\Serializer\Exclusion\AllExclusionStrategy;
 use JMS\SerializerBundle\Serializer\Exclusion\ExclusionStrategyFactory;
@@ -71,7 +65,7 @@ class PerformanceTest extends \PHPUnit_Framework_TestCase
     private function getSerializer()
     {
         $container = new ContainerBuilder();
-        $container->set('annotation_reader', new Reader());
+        $container->set('annotation_reader', new AnnotationReader());
         $extension = new JMSSerializerExtension();
         $extension->load(array(array()), $container);
 

Tests/Serializer/Normalizer/PropertyBasedNormalizerTest.php

@@ -2,12 +2,12 @@
 
 namespace JMS\SerializerBundle\Tests\Serializer\Normalizer;
 
+use Doctrine\Common\Annotations\AnnotationReader;
 use JMS\SerializerBundle\Serializer\Normalizer\NativePhpTypeNormalizer;
 use JMS\SerializerBundle\Serializer\Serializer;
 use JMS\SerializerBundle\Serializer\UnserializeInstanceCreator;
 use Metadata\MetadataFactory;
 use JMS\SerializerBundle\Metadata\Driver\AnnotationDriver;
-use Annotations\Reader;
 use JMS\SerializerBundle\Tests\Fixtures\AllExcludedObject;
 use JMS\SerializerBundle\Tests\Fixtures\VersionedObject;
 use JMS\SerializerBundle\Serializer\Exclusion\DisjunctExclusionStrategy;
@@ -19,7 +19,6 @@ use JMS\SerializerBundle\Tests\Fixtures\SimpleObject;
 use JMS\SerializerBundle\Serializer\Exclusion\ExclusionStrategyFactory;
 use JMS\SerializerBundle\Serializer\Naming\CamelCaseNamingStrategy;
 use JMS\SerializerBundle\Serializer\Naming\SerializedNameAnnotationStrategy;
-use Doctrine\Common\Annotations\AnnotationReader;
 use JMS\SerializerBundle\Serializer\Normalizer\PropertyBasedNormalizer;
 
 class PropertyBasedNormalizerTest extends \PHPUnit_Framework_TestCase
@@ -73,7 +72,7 @@ class PropertyBasedNormalizerTest extends \PHPUnit_Framework_TestCase
 
     protected function getNormalizer($version = null)
     {
-        $driver = new AnnotationDriver(new Reader());
+        $driver = new AnnotationDriver(new AnnotationReader());
         $propertyNamingStrategy = new SerializedNameAnnotationStrategy(new CamelCaseNamingStrategy('_'));
 
         if (null === $version) {

Tests/Serializer/SerializerTest.php

@@ -2,7 +2,7 @@
 
 namespace JMS\SerializerBundle\Tests\Serializer;
 
-use Annotations\Reader;
+use Doctrine\Common\Annotations\AnnotationReader;
 use Metadata\MetadataFactory;
 use JMS\SerializerBundle\Serializer\UnserializeInstanceCreator;
 use JMS\SerializerBundle\Metadata\Driver\AnnotationDriver;
@@ -101,7 +101,7 @@ class SerializerTest extends \PHPUnit_Framework_TestCase
 
         return new Serializer(
             new NativePhpTypeNormalizer(),
-            new PropertyBasedNormalizer(new MetadataFactory(new AnnotationDriver(new Reader())), $propertyNamingStrategy, new UnserializeInstanceCreator(), $exclusionStrategyFactory),
+            new PropertyBasedNormalizer(new MetadataFactory(new AnnotationDriver(new AnnotationReader())), $propertyNamingStrategy, new UnserializeInstanceCreator(), $exclusionStrategyFactory),
             $customNormalizers,
             $encoders
         );