Merge pull request #40 from phansys/master

Resolve Doctrine proxies to real entity names
stephpy · Nov 14, 2014 · e3dc567 · e3dc567
2 parents 022e8eb + 0454f2e
commit e3dc567
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,8 @@
     }],
     "require": {
         "php": ">=5.3.2",
-        "symfony/options-resolver": "*"
+        "symfony/options-resolver": "*",
+        "doctrine/common": "~2.2"
     },
     "require-dev": {
         "atoum/atoum": "dev-master",

diff --git a/src/ResolveComponent/BasicComponentDataResolver.php b/src/ResolveComponent/BasicComponentDataResolver.php
@@ -2,6 +2,7 @@
 
 namespace Spy\Timeline\ResolveComponent;
 
+use Doctrine\Common\Util\ClassUtils;
 use Spy\Timeline\Exception\ResolveComponentDataException;
 use Spy\Timeline\ResolveComponent\ValueObject\ResolveComponentModelIdentifier;
 use Spy\Timeline\ResolveComponent\ValueObject\ResolvedComponentData;
@@ -41,6 +42,8 @@ public function resolveComponentData(ResolveComponentModelIdentifier $resolve)
             $model = $modelClass;
         }
 
+        $model = ClassUtils::getRealClass($model);
+
         return new ResolvedComponentData($model, $identifier, $data);
     }
 }