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

Added Doctrine shortcut names for getting repositories

Browse source
This commit is contained in:
Richard Miller 2011-12-11 23:09:13 +00:00
parent 69afe16558
commit 1a921ec2a3
5 changed files with 88 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
DependencyInjection/FOQElasticaExtension.php
View file

@ -53,6 +53,12 @@ class FOQElasticaExtension extends Extension
$container->setAlias('foq_elastica.client', sprintf('foq_elastica.client.%s', $config['default_client']));
$container->setAlias('foq_elastica.index', sprintf('foq_elastica.index.%s', $config['default_index']));
$defaultManager = $this->loadedDoctrineDrivers[0];
if (in_array('orm', $this->loadedDoctrineDrivers)) {
$defaultManager = 'orm';
}
$container->setAlias('foq_elastica.manager', sprintf('foq_elastica.manager.%s', $defaultManager));
}
/**
@ -304,14 +310,15 @@ class FOQElasticaExtension extends Extension
$finderDef->replaceArgument(1, new Reference($elasticaToModelId));
$container->setDefinition($finderId, $finderDef);
$managerDef = $container->getDefinition('foq_elastica.manager');
$managerId = sprintf('foq_elastica.manager.%s', $typeConfig['driver']);
$managerDef = $container->getDefinition($managerId);
$arguments = array( $typeConfig['model'], new Reference($finderId));
if (isset($typeConfig['repository'])) {
$arguments[] = $typeConfig['repository'];
}
$managerDef->addMethodCall('addEntity', $arguments);
$container->setDefinition('foq_elastica.manager', $managerDef);
$container->setDefinition($managerId, $managerDef);
return $finderId;
}

35
Manager/RepositoryManager.php
View file

@ -2,6 +2,7 @@
namespace FOQ\ElasticaBundle\Manager;
use Doctrine\Common\Persistence\ManagerRegistry;
use FOQ\ElasticaBundle\Finder\FinderInterface;
use FOQ\ElasticaBundle\Repository;
use RuntimeException;
@ -16,6 +17,12 @@ class RepositoryManager implements RepositoryManagerInterface
{
protected $entities = array();
protected $repositories = array();
protected $managerRegistry;
public function __construct(ManagerRegistry $managerRegistry)
{
$this->managerRegistry = $managerRegistry;
}
public function addEntity($entityName, FinderInterface $finder, $repositoryName = null)
{
@ -32,27 +39,33 @@ class RepositoryManager implements RepositoryManagerInterface
*/
public function getRepository($entityName)
{
if (isset($this->repositories[$entityName])) {
return $this->repositories[$entityName];
$realEntityName = $entityName;
if (strpos($entityName, ':') !== false) {
list($namespaceAlias, $simpleClassName) = explode(':', $entityName);
$realEntityName = $this->managerRegistry->getAliasNamespace($namespaceAlias) . '\\' . $simpleClassName;
}
if (!isset($this->entities[$entityName])) {
throw new RuntimeException(sprintf('No search finder configured for %s', $entityName));
if (isset($this->repositories[$realEntityName])) {
return $this->repositories[$realEntityName];
}
if (isset($this->entities[$entityName]['repositoryName'])) {
if (!isset($this->entities[$realEntityName])) {
throw new RuntimeException(sprintf('No search finder configured for %s', $realEntityName));
}
$repositoryName = $this->entities[$entityName]['repositoryName'];
if (isset($this->entities[$realEntityName]['repositoryName'])) {
$repositoryName = $this->entities[$realEntityName]['repositoryName'];
if (!class_exists($repositoryName)) {
throw new RuntimeException(sprintf('%s repository for %s does not exist', $repositoryName, $entityName));
throw new RuntimeException(sprintf('%s repository for %s does not exist', $repositoryName, $realEntityName));
}
$repository = new $repositoryName($this->entities[$entityName]['finder']);
$this->repositories[$entityName] = $repository;
$repository = new $repositoryName($this->entities[$realEntityName]['finder']);
$this->repositories[$realEntityName] = $repository;
return $repository;
}
$repository = new Repository($this->entities[$entityName]['finder']);
$this->repositories[$entityName] = $repository;
$repository = new Repository($this->entities[$realEntityName]['finder']);
$this->repositories[$realEntityName] = $repository;
return $repository;
}

4
Resources/config/mongodb.xml
View file

@ -27,6 +27,10 @@
<argument type="collection" /> <!-- options -->
</service>
<service id="foq_elastica.manager.mongodb" class="FOQ\ElasticaBundle\Manager\RepositoryManager">
<argument type="service" id="doctrine.odm.mongodb"/>
</service>
</services>
</container>

4
Resources/config/orm.xml
View file

@ -27,6 +27,10 @@
<argument type="collection" /> <!-- options -->
</service>
<service id="foq_elastica.manager.orm" class="FOQ\ElasticaBundle\Manager\RepositoryManager">
<argument type="service" id="doctrine"/>
</service>
</services>
</container>

51
Tests/Manager/RepositoryManagerTest.php
View file

@ -18,9 +18,13 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$registryMock = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
->disableOriginalConstructor()
->getMock();
$entityName = 'Test Entity';
$manager = new RepositoryManager($finderMock);
$manager = new RepositoryManager($registryMock);
$manager->addEntity($entityName, $finderMock);
$repository = $manager->getRepository($entityName);
$this->assertInstanceOf('FOQ\ElasticaBundle\Repository', $repository);
@ -32,9 +36,13 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$registryMock = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
->disableOriginalConstructor()
->getMock();
$entityName = 'Test Entity';
$manager = new RepositoryManager($finderMock);
$manager = new RepositoryManager($registryMock);
$manager->addEntity($entityName, $finderMock, 'FOQ\ElasticaBundle\Tests\Manager\CustomRepository');
$repository = $manager->getRepository($entityName);
$this->assertInstanceOf('FOQ\ElasticaBundle\Tests\Manager\CustomRepository', $repository);
@ -49,9 +57,13 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$registryMock = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
->disableOriginalConstructor()
->getMock();
$entityName = 'Test Entity';
$manager = new RepositoryManager($finderMock);
$manager = new RepositoryManager($registryMock);
$manager->addEntity($entityName, $finderMock);
$manager->getRepository('Missing Entity');
}
@ -65,10 +77,41 @@ class RepositoryManagerTest extends \PHPUnit_Framework_TestCase
->disableOriginalConstructor()
->getMock();
$registryMock = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
->disableOriginalConstructor()
->getMock();
$entityName = 'Test Entity';
$manager = new RepositoryManager($finderMock);
$manager = new RepositoryManager($registryMock);
$manager->addEntity($entityName, $finderMock, 'FOQ\ElasticaBundle\Tests\MissingRepository');
$manager->getRepository('Missing Entity');
}
public function testThatGetRepositoryWorksWithShortEntityName()
{
$finderMock = $this->getMockBuilder('FOQ\ElasticaBundle\Finder\TransformedFinder')
->disableOriginalConstructor()
->getMock();
$registryMock = $this->getMockBuilder('Doctrine\Common\Persistence\ManagerRegistry')
->disableOriginalConstructor()
->getMock();
$shortEntityName = 'TestBundle:TestEntity';
$entityName = 'TestBundle\Full\Path\To\TestEntity';
$shortPath = 'TestBundle';
$fullPath = 'TestBundle\Full\Path\To';
$registryMock->expects($this->once())
->method('getAliasNamespace')
->with($this->equalTo($shortPath))
->will($this->returnValue($fullPath));
$manager = new RepositoryManager($registryMock);
$manager->addEntity($entityName, $finderMock);
$repository = $manager->getRepository($shortEntityName);
$this->assertInstanceOf('FOQ\ElasticaBundle\Repository', $repository);
}
}