From be951b7096ff7b9240c080cd8826062f897a4e97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= <dunglas@gmail.com>
Date: Thu, 18 May 2017 08:13:03 +0200
Subject: [PATCH] [Serializer] Remove deprecated DoctrineCache support

---
 .../Mapping/Factory/ClassMetadataFactory.php  | 22 +------------
 .../Factory/ClassMetadataFactoryTest.php      | 31 -------------------
 2 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php b/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php
index 6604430d190b8..448e61a6b6342 100644
--- a/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php
+++ b/src/Symfony/Component/Serializer/Mapping/Factory/ClassMetadataFactory.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Serializer\Mapping\Factory;
 
-use Doctrine\Common\Cache\Cache;
 use Symfony\Component\Serializer\Exception\InvalidArgumentException;
 use Symfony\Component\Serializer\Mapping\ClassMetadata;
 use Symfony\Component\Serializer\Mapping\Loader\LoaderInterface;
@@ -30,11 +29,6 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
      */
     private $loader;
 
-    /**
-     * @var Cache
-     */
-    private $cache;
-
     /**
      * @var array
      */
@@ -42,16 +36,10 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface
 
     /**
      * @param LoaderInterface $loader
-     * @param Cache|null      $cache
      */
-    public function __construct(LoaderInterface $loader, Cache $cache = null)
+    public function __construct(LoaderInterface $loader)
     {
         $this->loader = $loader;
-        $this->cache = $cache;
-
-        if (null !== $cache) {
-            @trigger_error(sprintf('Passing a Doctrine Cache instance as 2nd parameter of the "%s" constructor is deprecated since version 3.1. This parameter will be removed in Symfony 4.0. Use the "%s" class instead.', __CLASS__, CacheClassMetadataFactory::class), E_USER_DEPRECATED);
-        }
     }
 
     /**
@@ -65,10 +53,6 @@ public function getMetadataFor($value)
             return $this->loadedClasses[$class];
         }
 
-        if ($this->cache && ($this->loadedClasses[$class] = $this->cache->fetch($class))) {
-            return $this->loadedClasses[$class];
-        }
-
         $classMetadata = new ClassMetadata($class);
         $this->loader->loadClassMetadata($classMetadata);
 
@@ -84,10 +68,6 @@ public function getMetadataFor($value)
             $classMetadata->merge($this->getMetadataFor($interface->name));
         }
 
-        if ($this->cache) {
-            $this->cache->save($class, $classMetadata);
-        }
-
         return $this->loadedClasses[$class] = $classMetadata;
     }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php b/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php
index 903cc04d1f49f..15aa621c298cd 100644
--- a/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Mapping/Factory/ClassMetadataFactoryTest.php
@@ -45,35 +45,4 @@ public function testHasMetadataFor()
         $this->assertTrue($factory->hasMetadataFor('Symfony\Component\Serializer\Tests\Fixtures\GroupDummyInterface'));
         $this->assertFalse($factory->hasMetadataFor('Dunglas\Entity'));
     }
-
-    /**
-     * @group legacy
-     */
-    public function testCacheExists()
-    {
-        $cache = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock();
-        $cache
-            ->expects($this->once())
-            ->method('fetch')
-            ->will($this->returnValue('foo'))
-        ;
-
-        $factory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()), $cache);
-        $this->assertEquals('foo', $factory->getMetadataFor('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy'));
-    }
-
-    /**
-     * @group legacy
-     */
-    public function testCacheNotExists()
-    {
-        $cache = $this->getMockBuilder('Doctrine\Common\Cache\Cache')->getMock();
-        $cache->method('fetch')->will($this->returnValue(false));
-        $cache->method('save');
-
-        $factory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()), $cache);
-        $metadata = $factory->getMetadataFor('Symfony\Component\Serializer\Tests\Fixtures\GroupDummy');
-
-        $this->assertEquals(TestClassMetadataFactory::createClassMetadata(true, true), $metadata);
-    }
 }