deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactored RepositoryManager

Browse source
This commit is contained in:
Richard Miller 2011-12-23 16:38:22 +00:00
parent 510d411055
commit 77a73b1db6
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Doctrine/RepositoryManager.php
View file

@ -6,8 +6,6 @@ use Doctrine\Common\Annotations\Reader;
use Doctrine\Common\Persistence\ManagerRegistry;
use FOQ\ElasticaBundle\Finder\FinderInterface;
use FOQ\ElasticaBundle\Manager\RepositoryManager as BaseManager;
use FOQ\ElasticaBundle\Repository;
use RuntimeException;
/**
* @author Richard Miller <info@limethinking.co.uk>
@ -45,7 +43,7 @@ class RepositoryManager extends BaseManager
return parent::getRepository($realEntityName);
}
protected function getCustomRepositoryName($realEntityName)
protected function getRepositoryName($realEntityName)
{
if (isset($this->entities[$realEntityName]['repositoryName'])) {
return $this->entities[$realEntityName]['repositoryName'];
@ -58,6 +56,7 @@ class RepositoryManager extends BaseManager
= $annotation->repositoryClass;
return $annotation->repositoryClass;
}
return 'FOQ\ElasticaBundle\Repository';
}
}

20
Manager/RepositoryManager.php
View file

@ -3,7 +3,6 @@
namespace FOQ\ElasticaBundle\Manager;
use FOQ\ElasticaBundle\Finder\FinderInterface;
use FOQ\ElasticaBundle\Repository;
use RuntimeException;
/**
* @author Richard Miller <info@limethinking.co.uk>
@ -39,27 +38,22 @@ class RepositoryManager implements RepositoryManagerInterface
throw new RuntimeException(sprintf('No search finder configured for %s', $entityName));
}
$repositoryName = $this->getCustomRepositoryName($entityName);
if ($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;
}
protected function getCustomRepositoryName($realEntityName)
protected function getRepositoryName($realEntityName)
{
if (isset($this->entities[$realEntityName]['repositoryName'])) {
return $this->entities[$realEntityName]['repositoryName'];
}
return 'FOQ\ElasticaBundle\Repository';
}
}