Merge pull request #634 from schmittjoh/deprecated-reader

Remove deprecated FileCacheReader for doctrine annotations
schmittjoh · Sep 9, 2016 · b359a1b · b359a1b
2 parents 5bfdc3f + eef2428
commit b359a1b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/JMS/Serializer/SerializerBuilder.php b/src/JMS/Serializer/SerializerBuilder.php
@@ -18,6 +18,8 @@
 
 namespace JMS\Serializer;
 
+use Doctrine\Common\Annotations\CachedReader;
+use Doctrine\Common\Cache\FilesystemCache;
 use JMS\Serializer\Builder\DefaultDriverFactory;
 use JMS\Serializer\Builder\DriverFactoryInterface;
 use JMS\Serializer\Handler\PhpCollectionHandler;
@@ -42,7 +44,6 @@
 use JMS\Serializer\Naming\PropertyNamingStrategyInterface;
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\FileCacheReader;
 use Metadata\Cache\FileCache;
 use JMS\Serializer\Naming\SerializedNameAnnotationStrategy;
 use JMS\Serializer\Exception\InvalidArgumentException;
@@ -341,7 +342,8 @@ public function build()
 
             if (null !== $this->cacheDir) {
                 $this->createDir($this->cacheDir.'/annotations');
-                $annotationReader = new FileCacheReader($annotationReader, $this->cacheDir.'/annotations', $this->debug);
+                $annotationsCache = new FilesystemCache($this->cacheDir.'/annotations');
+                $annotationReader = new CachedReader($annotationReader, $annotationsCache, $this->debug);
             }
         }