symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
-5 b/‎src/Symfony/Bundle/FrameworkBundle/Resources/config/validator.xml
-5
diff --git a/‎src/Symfony/Component/Validator/Mapping/Cache/CacheInterface.php
-45 b/‎src/Symfony/Component/Validator/Mapping/Cache/CacheInterface.php
-45
diff --git a/‎src/Symfony/Component/Validator/Mapping/Cache/DoctrineCache.php
-63 b/‎src/Symfony/Component/Validator/Mapping/Cache/DoctrineCache.php
-63
diff --git a/‎src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php
-80 b/‎src/Symfony/Component/Validator/Mapping/Cache/Psr6Cache.php
-80
diff --git a/‎src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
+8-33 b/‎src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
+8-33
diff --git a/‎src/Symfony/Component/Validator/Tests/Mapping/Cache/AbstractCacheTest.php
-79 b/‎src/Symfony/Component/Validator/Tests/Mapping/Cache/AbstractCacheTest.php
-79
diff --git a/‎src/Symfony/Component/Validator/Tests/Mapping/Cache/DoctrineCacheTest.php
-26 b/‎src/Symfony/Component/Validator/Tests/Mapping/Cache/DoctrineCacheTest.php
-26
@@ -38,11 +38,6 @@
             <tag name="kernel.cache_warmer" />
         </service>
 
-        <service id="validator.mapping.cache.symfony" class="Symfony\Component\Validator\Mapping\Cache\Psr6Cache">
-            <argument type="service" id="validator.mapping.cache.adapter" />
-            <deprecated>The "%service_id%" service is deprecated since Symfony 4.4. Use validator.mapping.cache.adapter instead.</deprecated>
-        </service>
-
         <service id="validator.mapping.cache.adapter" class="Symfony\Component\Cache\Adapter\PhpArrayAdapter">
             <factory class="Symfony\Component\Cache\Adapter\PhpArrayAdapter" method="create" />
             <argument>%validator.mapping.cache.file%</argument>
 
@@ -13,7 +13,6 @@
 
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Validator\Exception\NoSuchMetadataException;
-use Symfony\Component\Validator\Mapping\Cache\CacheInterface;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
 
@@ -49,20 +48,8 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
      */
     protected $loadedClasses = [];
 
-    /**
-     * Creates a new metadata factory.
-     *
-     * @param CacheItemPoolInterface|null $cache The cache for persisting metadata
-     *                                           between multiple PHP requests
-     */
-    public function __construct(LoaderInterface $loader = null, $cache = null)
+    public function __construct(LoaderInterface $loader = null, CacheItemPoolInterface $cache = null)
     {
-        if ($cache instanceof CacheInterface) {
-            @trigger_error(sprintf('Passing a "%s" to "%s" is deprecated in Symfony 4.4 and will trigger a TypeError in 5.0. Please pass an implementation of "%s" instead.', \get_class($cache), __METHOD__, CacheItemPoolInterface::class), E_USER_DEPRECATED);
-        } elseif (!$cache instanceof CacheItemPoolInterface && null !== $cache) {
-            throw new \TypeError(sprintf('Expected an instance of %s, got %s.', CacheItemPoolInterface::class, \is_object($cache) ? \get_class($cache) : \gettype($cache)));
-        }
-
         $this->loader = $loader;
         $this->cache = $cache;
     }
@@ -98,24 +85,14 @@ public function getMetadataFor($value)
             throw new NoSuchMetadataException(sprintf('The class or interface "%s" does not exist.', $class));
         }
 
-        $cacheItem = null;
-        if ($this->cache instanceof CacheInterface) {
-            if ($metadata = $this->cache->read($class)) {
-                // Include constraints from the parent class
-                $this->mergeConstraints($metadata);
-
-                return $this->loadedClasses[$class] = $metadata;
-            }
-        } elseif (null !== $this->cache) {
-            $cacheItem = $this->cache->getItem($this->escapeClassName($class));
-            if ($cacheItem->isHit()) {
-                $metadata = $cacheItem->get();
+        $cacheItem = null === $this->cache ? null : $this->cache->getItem($this->escapeClassName($class));
+        if ($cacheItem && $cacheItem->isHit()) {
+            $metadata = $cacheItem->get();
 
-                // Include constraints from the parent class
-                $this->mergeConstraints($metadata);
+            // Include constraints from the parent class
+            $this->mergeConstraints($metadata);
 
-                return $this->loadedClasses[$class] = $metadata;
-            }
+            return $this->loadedClasses[$class] = $metadata;
         }
 
         $metadata = new ClassMetadata($class);
@@ -124,9 +101,7 @@ public function getMetadataFor($value)
             $this->loader->loadClassMetadata($metadata);
         }
 
-        if ($this->cache instanceof CacheInterface) {
-            $this->cache->write($metadata);
-        } elseif (null !== $cacheItem) {
+        if (null !== $cacheItem) {
             $this->cache->save($cacheItem->set($metadata));
         }