Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support bundle alias notation #1566

Closed
wants to merge 1 commit into from
Closed

support bundle alias notation #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions DependencyInjection/Compiler/RegisterMappingsPass.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,27 @@ class RegisterMappingsPass implements CompilerPassInterface
private $namespaces;
private $enabledParameter;
private $fallbackManagerParameter;
private $configurationPattern;
private $registerAliasMethodName;
private $aliasMap;

public function __construct($driver, $driverPattern, $namespaces, $enabledParameter, $fallbackManagerParameter)
public function __construct($driver, $driverPattern, $namespaces, $enabledParameter, $fallbackManagerParameter, $configurationPattern = '', $registerAliasMethodName = '', array $aliasMap = array())
{
$this->driver = $driver;
$this->driverPattern = $driverPattern;
$this->namespaces = $namespaces;
$this->enabledParameter = $enabledParameter;
$this->fallbackManagerParameter = $fallbackManagerParameter;
if (count($aliasMap) && (!$configurationPattern || !$registerAliasMethodName)) {
throw new \InvalidArgumentException('configurationPattern and registerAliasMethodName are required to register namespace alias');
}
$this->configurationPattern = $configurationPattern;
$this->registerAliasMethodName = $registerAliasMethodName;
$this->aliasMap = $aliasMap;
}

/**
* Register mappings with the metadata drivers.
* Register mappings and aliases with the metadata drivers.
*
* @param ContainerBuilder $container
*/
Expand All @@ -55,10 +64,22 @@ public function process(ContainerBuilder $container)
}

$chainDriverDefService = $this->getChainDriverServiceName($container);
// Definition for a Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain
$chainDriverDef = $container->getDefinition($chainDriverDefService);
foreach ($this->namespaces as $namespace) {
$chainDriverDef->addMethodCall('addDriver', array($this->driver, $namespace));
}

if (!count($this->aliasMap)) {
return;
}

$configurationServiceName = $this->getConfigurationServiceName($container);
// Definition of the Doctrine\...\Configuration class specific to the Doctrine flavour.
$configurationServiceDefinition = $container->getDefinition($configurationServiceName);
foreach ($this->aliasMap as $alias => $namespace) {
$configurationServiceDefinition->addMethodCall($this->registerAliasMethodName, array($alias, $namespace));
}
}

protected function getChainDriverServiceName(ContainerBuilder $container)
Expand All @@ -75,30 +96,30 @@ protected function getChainDriverServiceName(ContainerBuilder $container)
throw new ParameterNotFoundException('None of the managerParameters resulted in a valid name');
}

public static function createOrmMappingDriver(array $mappings)
public static function createOrmMappingDriver(array $mappings, array $aliasMap = array())
{
$arguments = array($mappings, '.orm.xml');
$locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', $arguments);
$driver = new Definition('Doctrine\ORM\Mapping\Driver\XmlDriver', array($locator));

return new RegisterMappingsPass($driver, 'doctrine.orm.%s_metadata_driver', $mappings, 'fos_user.backend_type_orm', 'doctrine.default_entity_manager');
return new RegisterMappingsPass($driver, 'doctrine.orm.%s_metadata_driver', $mappings, 'fos_user.backend_type_orm', 'doctrine.default_entity_manager', 'doctrine.orm.%s_configuration', 'addEntityNamespace', $aliasMap);
}

public static function createMongoDBMappingDriver($mappings)
public static function createMongoDBMappingDriver($mappings, array $aliasMap = array())
{
$arguments = array($mappings, '.mongodb.xml');
$locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', $arguments);
$driver = new Definition('Doctrine\ODM\MongoDB\Mapping\Driver\XmlDriver', array($locator));

return new RegisterMappingsPass($driver, 'doctrine_mongodb.odm.%s_metadata_driver', $mappings, 'fos_user.backend_type_mongodb', 'doctrine_mongodb.odm.default_document_manager');
return new RegisterMappingsPass($driver, 'doctrine_mongodb.odm.%s_metadata_driver', $mappings, 'fos_user.backend_type_mongodb', 'doctrine_mongodb.odm.default_document_manager', 'doctrine_mongodb.odm.%s_configuration', 'addDocumentNamespace', $aliasMap);
}

public static function createCouchDBMappingDriver($mappings)
public static function createCouchDBMappingDriver($mappings, array $aliasMap = array())
{
$arguments = array($mappings, '.couchdb.xml');
$locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', $arguments);
$driver = new Definition('Doctrine\ODM\CouchDB\Mapping\Driver\XmlDriver', array($locator));

return new RegisterMappingsPass($driver, 'doctrine_couchdb.odm.%s_metadata_driver', $mappings, 'fos_user.backend_type_couchdb', 'doctrine_couchdb.default_document_manager');
return new RegisterMappingsPass($driver, 'doctrine_couchdb.odm.%s_metadata_driver', $mappings, 'fos_user.backend_type_couchdb', 'doctrine_couchdb.default_document_manager', 'doctrine_couchdb.odm.%s_configuration', 'addDocumentNamespace', $aliasMap);
}
}
23 changes: 14 additions & 9 deletions FOSUserBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
namespace FOS\UserBundle;

use Symfony\Component\HttpKernel\Bundle\Bundle;
use Symfony\Component\HttpKernel\Kernel;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use FOS\UserBundle\DependencyInjection\Compiler\ValidationPass;
use FOS\UserBundle\DependencyInjection\Compiler\RegisterMappingsPass;
Expand All @@ -38,29 +39,33 @@ public function build(ContainerBuilder $container)
*/
private function addRegisterMappingsPass(ContainerBuilder $container)
{
// the base class is only available since symfony 2.3
$symfonyVersion = class_exists('Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterMappingsPass');
// alias support was added later
$symfonyVersion = version_compare(Kernel::VERSION, '2.6.0', '>=');
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we have symfony 2.6 but DoctrineBundle < 1.3 the alias support will still not work. but i don't think its worth starting to introspect the orm compiler pass and whatnot.

or we could simply never use the compiler pass from symfony but always our local compiler pass...


$mappings = array(
$namespaces = array(
realpath(__DIR__ . '/Resources/config/doctrine/model') => 'FOS\UserBundle\Model',
);

$aliasMap = array(
'FOS\UserBundle\Model' => 'FOSUserBundle',
);

if ($symfonyVersion && class_exists('Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass')) {
$container->addCompilerPass(DoctrineOrmMappingsPass::createXmlMappingDriver($mappings, array('fos_user.model_manager_name'), 'fos_user.backend_type_orm'));
$container->addCompilerPass(DoctrineOrmMappingsPass::createXmlMappingDriver($namespaces, array('fos_user.model_manager_name'), 'fos_user.backend_type_orm', $aliasMap));
} else {
$container->addCompilerPass(RegisterMappingsPass::createOrmMappingDriver($mappings));
$container->addCompilerPass(RegisterMappingsPass::createOrmMappingDriver($namespaces, $aliasMap));
}

if ($symfonyVersion && class_exists('Doctrine\Bundle\MongoDBBundle\DependencyInjection\Compiler\DoctrineMongoDBMappingsPass')) {
$container->addCompilerPass(DoctrineMongoDBMappingsPass::createXmlMappingDriver($mappings, array('fos_user.model_manager_name'), 'fos_user.backend_type_mongodb'));
$container->addCompilerPass(DoctrineMongoDBMappingsPass::createXmlMappingDriver($namespaces, array('fos_user.model_manager_name'), 'fos_user.backend_type_mongodb', $aliasMap));
} else {
$container->addCompilerPass(RegisterMappingsPass::createMongoDBMappingDriver($mappings));
$container->addCompilerPass(RegisterMappingsPass::createMongoDBMappingDriver($namespaces, $aliasMap));
}

if ($symfonyVersion && class_exists('Doctrine\Bundle\CouchDBBundle\DependencyInjection\Compiler\DoctrineCouchDBMappingsPass')) {
$container->addCompilerPass(DoctrineCouchDBMappingsPass::createXmlMappingDriver($mappings, array('fos_user.model_manager_name'), 'fos_user.backend_type_couchdb'));
$container->addCompilerPass(DoctrineCouchDBMappingsPass::createXmlMappingDriver($namespaces, array('fos_user.model_manager_name'), 'fos_user.backend_type_couchdb', $aliasMap));
} else {
$container->addCompilerPass(RegisterMappingsPass::createCouchDBMappingDriver($mappings));
$container->addCompilerPass(RegisterMappingsPass::createCouchDBMappingDriver($namespaces, $aliasMap));
}
}
}