Load proxies before getting value for uploadable field

dustin10 · Aug 27, 2013 · fb40b7d · fb40b7d
1 parent 16d6321
commit fb40b7d
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Mapping/PropertyMappingFactory.php b/Mapping/PropertyMappingFactory.php
@@ -7,6 +7,7 @@
 use Vich\UploaderBundle\Adapter\AdapterInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Vich\UploaderBundle\Mapping\Annotation\UploadableField;
+use Doctrine\Common\Persistence\Proxy;
 
 /**
  * PropertyMappingFactory.
@@ -61,6 +62,9 @@ public function __construct(ContainerInterface $container, AnnotationDriver $dri
      */
     public function fromObject($obj)
     {
+        if ($obj instanceof Proxy) {
+            $obj->__load();
+        }
         $class = $this->adapter->getReflectionClass($obj);
         $this->checkUploadable($class);
 
@@ -82,6 +86,9 @@ public function fromObject($obj)
      */
     public function fromField($obj, $field)
     {
+        if ($obj instanceof Proxy) {
+            $obj->__load();
+        }
         $class = $this->adapter->getReflectionClass($obj);
         $this->checkUploadable($class);