From 47440b59bb97620f266e34c77dda8791c522503f Mon Sep 17 00:00:00 2001
From: Richard Miller <richard.miller@limethinking.co.uk>
Date: Fri, 23 Dec 2011 16:38:22 +0000
Subject: [PATCH] Refactored RepositoryManager

Conflicts:

	Doctrine/RepositoryManager.php
	Manager/RepositoryManager.php
---
 Manager/RepositoryManager.php | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/Manager/RepositoryManager.php b/Manager/RepositoryManager.php
index 3516e67..fdaa643 100644
--- a/Manager/RepositoryManager.php
+++ b/Manager/RepositoryManager.php
@@ -4,7 +4,6 @@ namespace FOQ\ElasticaBundle\Manager;
 
 use Doctrine\Common\Annotations\Reader;
 use FOQ\ElasticaBundle\Finder\FinderInterface;
-use FOQ\ElasticaBundle\Repository;
 use RuntimeException;
 /**
  * @author Richard Miller <info@limethinking.co.uk>
@@ -46,36 +45,30 @@ class RepositoryManager implements RepositoryManagerInterface
             throw new RuntimeException(sprintf('No search finder configured for %s', $entityName));
         }
 
-        $this->setRepositoryFromAnnotation($entityName);
-
-        if (isset($this->entities[$entityName]['repositoryName'])) {
-
-            $repositoryName = $this->entities[$entityName]['repositoryName'];
-            if (!class_exists($repositoryName)) {
-                throw new RuntimeException(sprintf('%s repository for %s does not exist', $repositoryName, $entityName));
-            }
-            $repository = new $repositoryName($this->entities[$entityName]['finder']);
-            $this->repositories[$entityName] = $repository;
-            return $repository;
+        $repositoryName = $this->getRepositoryName($entityName);
+        if (!class_exists($repositoryName)) {
+            throw new RuntimeException(sprintf('%s repository for %s does not exist', $repositoryName, $entityName));
         }
-
-        $repository = new Repository($this->entities[$entityName]['finder']);
+        $repository = new $repositoryName($this->entities[$entityName]['finder']);
         $this->repositories[$entityName] = $repository;
+
         return $repository;
     }
 
-    private function setRepositoryFromAnnotation($realEntityName)
+    protected function getRepositoryName($realEntityName)
     {
         if (isset($this->entities[$realEntityName]['repositoryName'])) {
-            return;
+            return $this->entities[$realEntityName]['repositoryName'];
         }
 
-        $refClass = new \ReflectionClass($realEntityName);
+        $refClass   = new \ReflectionClass($realEntityName);
         $annotation = $this->reader->getClassAnnotation($refClass, 'FOQ\\ElasticaBundle\\Configuration\\Search');
         if ($annotation) {
             $this->entities[$realEntityName]['repositoryName']
                 = $annotation->repositoryClass;
         }
+
+        return 'FOQ\ElasticaBundle\Repository';
     }
 
 }