From cd914209bd3acbc637c4b435626f003696ebacb7 Mon Sep 17 00:00:00 2001
From: Pascal Montoya <>
Date: Fri, 6 Apr 2018 07:52:15 +0200
Subject: [PATCH 1/2] [Validator] Fix LazyLoadingMetadataFactory with PSR6Cache
 for non classname if tested values isn't an existing class

---
 .../Factory/LazyLoadingMetadataFactory.php        |  8 ++++----
 .../Factory/LazyLoadingMetadataFactoryTest.php    | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
index 1a4f3074b6e4..84375ec69495 100644
--- a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
+++ b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -90,6 +90,10 @@ public function getMetadataFor($value)
             return $this->loadedClasses[$class];
         }
 
+        if (!class_exists($class) && !interface_exists($class)) {
+            throw new NoSuchMetadataException(sprintf('The class or interface "%s" does not exist.', $class));
+        }
+
         if (null !== $this->cache && false !== ($metadata = $this->cache->read($class))) {
             // Include constraints from the parent class
             $this->mergeConstraints($metadata);
@@ -97,10 +101,6 @@ public function getMetadataFor($value)
             return $this->loadedClasses[$class] = $metadata;
         }
 
-        if (!class_exists($class) && !interface_exists($class)) {
-            throw new NoSuchMetadataException(sprintf('The class or interface "%s" does not exist.', $class));
-        }
-
         $metadata = new ClassMetadata($class);
 
         if (null !== $this->loader) {
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
index b5d1a9dc84d4..de6852271e17 100644
--- a/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
+++ b/src/Symfony/Component/Validator/Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php
@@ -149,6 +149,21 @@ public function testReadMetadataFromCache()
         $this->assertEquals($metadata, $factory->getMetadataFor(self::PARENT_CLASS));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Validator\Exception\NoSuchMetadataException
+     */
+    public function testNonClassNameStringValues()
+    {
+        $testedValue = 'error@example.com';
+        $loader = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Loader\LoaderInterface')->getMock();
+        $cache = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Cache\CacheInterface')->getMock();
+        $factory = new LazyLoadingMetadataFactory($loader, $cache);
+        $cache
+            ->expects($this->never())
+            ->method('read');
+        $factory->getMetadataFor($testedValue);
+    }
+
     public function testMetadataCacheWithRuntimeConstraint()
     {
         $cache = $this->getMockBuilder('Symfony\Component\Validator\Mapping\Cache\CacheInterface')->getMock();

From 5198f435a047aad8d5ed119e918cf8c008ea65b7 Mon Sep 17 00:00:00 2001
From: Pascal Montoya <p.montoya@highco.fr>
Date: Mon, 9 Apr 2018 10:29:56 +0200
Subject: [PATCH 2/2] Disable autoloader call on interface_exists check

---
 .../Validator/Mapping/Factory/LazyLoadingMetadataFactory.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
index 84375ec69495..e088caa897a7 100644
--- a/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
+++ b/src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
@@ -90,7 +90,7 @@ public function getMetadataFor($value)
             return $this->loadedClasses[$class];
         }
 
-        if (!class_exists($class) && !interface_exists($class)) {
+        if (!class_exists($class) && !interface_exists($class, false)) {
             throw new NoSuchMetadataException(sprintf('The class or interface "%s" does not exist.', $class));
         }