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

Moved annotation use back into RepositoryManager

Browse source
This commit is contained in:
Richard Miller 2011-12-24 14:44:37 +00:00
parent 77a73b1db6
commit 231e3a0b06
3 changed files with 37 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Doctrine/RepositoryManager.php
View file

@ -18,12 +18,11 @@ class RepositoryManager extends BaseManager
protected $entities = array();
protected $repositories = array();
protected $managerRegistry;
protected $reader;
public function __construct(ManagerRegistry $managerRegistry, Reader $reader)
{
$this->managerRegistry = $managerRegistry;
$this->reader = $reader;
parent::__construct($reader);
}
/**
@ -43,20 +42,4 @@ class RepositoryManager extends BaseManager
return parent::getRepository($realEntityName);
}
protected function getRepositoryName($realEntityName)
{
if (isset($this->entities[$realEntityName]['repositoryName'])) {
return $this->entities[$realEntityName]['repositoryName'];
}
$refClass = new \ReflectionClass($realEntityName);
$annotation = $this->reader->getClassAnnotation($refClass, 'FOQ\\ElasticaBundle\\Configuration\\Search');
if ($annotation) {
$this->entities[$realEntityName]['repositoryName']
= $annotation->repositoryClass;
return $annotation->repositoryClass;
}
return 'FOQ\ElasticaBundle\Repository';
}
}

16
Manager/RepositoryManager.php
View file

@ -2,6 +2,7 @@
namespace FOQ\ElasticaBundle\Manager;
use Doctrine\Common\Annotations\Reader;
use FOQ\ElasticaBundle\Finder\FinderInterface;
use RuntimeException;
/**
@ -14,6 +15,12 @@ class RepositoryManager implements RepositoryManagerInterface
{
protected $entities = array();
protected $repositories = array();
protected $reader;
public function __construct(Reader $reader)
{
$this->reader = $reader;
}
public function addEntity($entityName, FinderInterface $finder, $repositoryName = null)
{
@ -53,6 +60,15 @@ class RepositoryManager implements RepositoryManagerInterface
if (isset($this->entities[$realEntityName]['repositoryName'])) {
return $this->entities[$realEntityName]['repositoryName'];
}
$refClass = new \ReflectionClass($realEntityName);
$annotation = $this->reader->getClassAnnotation($refClass, 'FOQ\\ElasticaBundle\\Configuration\\Search');
if ($annotation) {
$this->entities[$realEntityName]['repositoryName']
= $annotation->repositoryClass;
return $annotation->repositoryClass;
}
return 'FOQ\ElasticaBundle\Repository';
}

24
Tests/Manager/RepositoryManagerTest.php
View file

@ -20,9 +20,13 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$readerMock = $this->getMockBuilder('Doctrine\Common\Annotations\Reader')
->disableOriginalConstructor()
->getMock();
$entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
$manager = new RepositoryManager();
$manager = new RepositoryManager($readerMock);
$manager->addEntity($entityName, $finderMock);
$repository = $manager->getRepository($entityName);
$this->assertInstanceOf('FOQ\ElasticaBundle\Repository', $repository);
@ -34,9 +38,13 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$readerMock = $this->getMockBuilder('Doctrine\Common\Annotations\Reader')
->disableOriginalConstructor()
->getMock();
$entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
$manager = new RepositoryManager();
$manager = new RepositoryManager($readerMock);
$manager->addEntity($entityName, $finderMock, 'FOQ\ElasticaBundle\Tests\Manager\CustomRepository');
$repository = $manager->getRepository($entityName);
$this->assertInstanceOf('FOQ\ElasticaBundle\Tests\Manager\CustomRepository', $repository);
@ -51,9 +59,13 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$readerMock = $this->getMockBuilder('Doctrine\Common\Annotations\Reader')
->disableOriginalConstructor()
->getMock();
$entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
$manager = new RepositoryManager();
$manager = new RepositoryManager($readerMock);
$manager->addEntity($entityName, $finderMock);
$manager->getRepository('Missing Entity');
}
@ -67,9 +79,13 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$readerMock = $this->getMockBuilder('Doctrine\Common\Annotations\Reader')
->disableOriginalConstructor()
->getMock();
$entityName = 'FOQ\ElasticaBundle\Tests\Manager\Entity';
$manager = new RepositoryManager();
$manager = new RepositoryManager($readerMock);
$manager->addEntity($entityName, $finderMock, 'FOQ\ElasticaBundle\Tests\MissingRepository');
$manager->getRepository('Missing Entity');
}