Update src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php

vicb · vicb · commit 99406eb761b7 · 2012-03-16T23:38:13.000+01:00
diff --git a/src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php b/src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php
@@ -45,35 +45,6 @@ public function getClassMetadata($class)
     {
         $class = ltrim($class, '\\');
 
-        if (!isset($this->loadedClasses[$class])) {
-            if ($this->cache !== null && $this->cache->has($class)) {
-                $this->loadedClasses[$class] = $this->cache->read($class);
-            } else {
-                $metadata = new ClassMetadata($class);
-
-                // Include constraints from the parent class
-                if ($parent = $metadata->getReflectionClass()->getParentClass()) {
-                    $metadata->mergeConstraints($this->getClassMetadata($parent->getName()));
-                }
-
-                // Include constraints from all implemented interfaces
-                foreach ($metadata->getReflectionClass()->getInterfaces() as $interface) {
-                    if ('Symfony\Component\Validator\GroupSequenceProviderInterface' === $interface->getName()) {
-                        continue;
-                    }
-                    $metadata->mergeConstraints($this->getClassMetadata($interface->getName()));
-                }
-
-                $this->loader->loadClassMetadata($metadata);
-
-                $this->loadedClasses[$class] = $metadata;
-
-                if ($this->cache !== null) {
-                    $this->cache->write($metadata);
-                }
-            }
-        }
-
         if (null !== $this->cache && false !== ($this->loadedClasses[$class] = $this->cache->read($class))) {
             return $this->loadedClasses[$class];
         }
@@ -87,6 +58,9 @@ public function getClassMetadata($class)
 
         // Include constraints from all implemented interfaces
         foreach ($metadata->getReflectionClass()->getInterfaces() as $interface) {
+            if ('Symfony\Component\Validator\GroupSequenceProviderInterface' === $interface->getName()) {
+                continue;
+            }
             $metadata->mergeConstraints($this->getClassMetadata($interface->getName()));
         }
 
