Skip to content

[Resource] Make factory, form, choice form, domain manager, controller, id/label property path optional #47

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

Merged
merged 1 commit into from
Jun 12, 2016
Merged

[Resource] Make factory, form, choice form, domain manager, controller, id/label property path optional #47

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
47 changes: 39 additions & 8 deletions src/Bundle/ResourceBundle/DependencyInjection/Extension/ResourceConfiguration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,43 @@ private function createResourceNode(ResourceInterface $resource, $name = null)
$resourceNode = $this->createNode($name ?: $resource->getName())->addDefaultsIfNotSet();
$childrenNode = $resourceNode->children()
->append($this->createDriverNode($resource))
->append($this->createClassNode('model', $resource->getModel(), $resource->getInterfaces()))
->append($this->createClassNode('controller', $resource->getController(), [ControllerInterface::class]))
->append($this->createClassNode('factory', $resource->getFactory(), [FactoryInterface::class]))
->append($this->createClassNode('repository', $resource->getRepository(), [RepositoryInterface::class]))
->append($this->createClassNode(
'model',
$resource->getModel(),
$resource->getInterfaces(),
true
))
->append($this->createClassNode(
'repository',
$resource->getRepository(),
[RepositoryInterface::class],
true
))
->append($this->createClassNode(
'factory',
$resource->getFactory(),
[FactoryInterface::class]
))
->append($this->createClassNode(
'form',
$resource->getForm(),
[FormTypeInterface::class]
))
->append($this->createClassNode(
'choice_form',
$resource->getChoiceForm(),
[FormTypeInterface::class]
))
->append($this->createClassNode(
'domain_manager',
$resource->getDomainManager(),
[DomainManagerInterface::class]
))
->append($this->createClassNode('form', $resource->getForm(), [FormTypeInterface::class]))
->append($this->createClassNode('choice_form', $resource->getChoiceForm(), [FormTypeInterface::class]))
->append($this->createClassNode(
'controller',
$resource->getController(),
[ControllerInterface::class]
))
->append($this->createNode('id_property_path', 'scalar', $resource->getIdPropertyPath()))
->append($this->createNode('label_property_path', 'scalar', $resource->getLabelPropertyPath()));

Expand Down Expand Up @@ -145,12 +171,17 @@ private function createDriverMappingNode(ResourceInterface $resource)
* @param string $name
* @param string $class
* @param string[] $interfaces
* @param bool $required
*
* @return NodeDefinition
*/
private function createClassNode($name, $class, array $interfaces = [])
private function createClassNode($name, $class, array $interfaces = [], $required = false)
{
return $this->createNode($name, 'scalar', $class, function ($class) use ($interfaces) {
return $this->createNode($name, 'scalar', $class, function ($class) use ($interfaces, $required) {
if ($class === null) {
return $required;
}

if (!class_exists($class)) {
return true;
}
Expand Down
104 changes: 57 additions & 47 deletions src/Bundle/ResourceBundle/DependencyInjection/Extension/ResourceExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ private function configureResource(ResourceInterface $resource, array $config)
$resource->setDriverMappingPath($config['driver']['mapping']['path']);
$resource->setDriverMappingFormat($config['driver']['mapping']['format']);
$resource->setModel($config['model']);
$resource->setController($config['controller']);
$resource->setFactory($config['factory']);
$resource->setRepository($config['repository']);
$resource->setDomainManager($config['domain_manager']);
$resource->setForm($config['form']);
$resource->setChoiceForm($config['choice_form']);
$resource->setIdPropertyPath($config['id_property_path']);
$resource->setLabelPropertyPath($config['label_property_path']);
$resource->setFactory(isset($config['factory']) ? $config['factory'] : null);
$resource->setForm(isset($config['form']) ? $config['form'] : null);
$resource->setChoiceForm(isset($config['choice_form']) ? $config['choice_form'] : null);
$resource->setDomainManager(isset($config['domain_manager']) ? $config['domain_manager'] : null);
$resource->setController(isset($config['controller']) ? $config['controller'] : null);
$resource->setIdPropertyPath(isset($config['id_property_path']) ? $config['id_property_path'] : null);
$resource->setLabelPropertyPath(isset($config['label_property_path']) ? $config['label_property_path'] : null);
}

/**
Expand All @@ -115,50 +115,60 @@ private function configureResource(ResourceInterface $resource, array $config)
private function loadResource(ResourceInterface $resource, ContainerBuilder $container)
{
$name = $resource->getName();
$controller = 'lug.controller.'.$name;
$factory = 'lug.factory.'.$name;
$repository = 'lug.repository.'.$name;
$domainManager = 'lug.domain_manager.'.$name;
$factory = 'lug.factory.'.$name;
$form = 'lug.form.type.'.$name;
$choiceForm = $form.'.choice';
$domainManager = 'lug.domain_manager.'.$name;
$controller = 'lug.controller.'.$name;

$container->setDefinition('lug.resource.'.$resource->getName(), $this->createResourceDefinition($resource));
$container->setAlias('lug.manager.'.$resource->getName(), $this->createManagerAlias($resource));

if (class_exists($resource->getController())) {
$container->setDefinition($controller, $this->createControllerDefinition($resource));
} elseif ($controller !== $resource->getController()) {
$container->setAlias($container, $resource->getController());
}

if (class_exists($resource->getFactory())) {
$container->setDefinition($factory, $this->createFactoryDefinition($resource));
} elseif ($factory !== $resource->getFactory()) {
$container->setAlias($factory, $resource->getFactory());
}

if (class_exists($resource->getRepository())) {
$container->setDefinition($repository, $this->createRepositoryDefinition($resource));
} elseif ($repository !== $resource->getRepository()) {
$container->setAlias($repository, $resource->getRepository());
}

if (class_exists($resource->getDomainManager())) {
$container->setDefinition($domainManager, $this->createDomainManagerDefinition($resource));
} elseif ($domainManager !== $resource->getDomainManager()) {
$container->setAlias($domainManager, $resource->getDomainManager());
if ($resource->getFactory() !== null) {
if (class_exists($resource->getFactory())) {
$container->setDefinition($factory, $this->createFactoryDefinition($resource));
} elseif ($factory !== $resource->getFactory()) {
$container->setAlias($factory, $resource->getFactory());
}
}

if (class_exists($resource->getForm())) {
$container->setDefinition($form, $this->createFormDefinition($resource));
} elseif ($form !== $resource->getForm()) {
$container->setAlias($form, $resource->getForm());
if ($resource->getForm() !== null) {
if (class_exists($resource->getForm())) {
$container->setDefinition($form, $this->createFormDefinition($resource));
} elseif ($form !== $resource->getForm()) {
$container->setAlias($form, $resource->getForm());
}
}

if (class_exists($resource->getChoiceForm())) {
$container->setDefinition($choiceForm, $this->createChoiceFormDefinition($resource));
} elseif ($choiceForm !== $resource->getChoiceForm()) {
$container->setAlias($choiceForm, $resource->getChoiceForm());
if ($resource->getChoiceForm() !== null) {
if (class_exists($resource->getChoiceForm())) {
$container->setDefinition($choiceForm, $this->createChoiceFormDefinition($resource));
} elseif ($choiceForm !== $resource->getChoiceForm()) {
$container->setAlias($choiceForm, $resource->getChoiceForm());
}
}

if ($resource->getDomainManager() !== null) {
if (class_exists($resource->getDomainManager())) {
$container->setDefinition($domainManager, $this->createDomainManagerDefinition($resource));
} elseif ($domainManager !== $resource->getDomainManager()) {
$container->setAlias($domainManager, $resource->getDomainManager());
}
}

if ($resource->getController() !== null) {
if (class_exists($resource->getController())) {
$container->setDefinition($controller, $this->createControllerDefinition($resource));
} elseif ($controller !== $resource->getController()) {
$container->setAlias($container, $resource->getController());
}
}

$container->addClassResource(new \ReflectionClass($resource));
Expand All @@ -179,12 +189,12 @@ private function createResourceDefinition(ResourceInterface $resource)
$resource->getDriverMappingFormat(),
$resource->getInterfaces(),
$resource->getModel(),
$resource->getController(),
$resource->getFactory(),
$resource->getRepository(),
$resource->getDomainManager(),
$resource->getFactory(),
$resource->getForm(),
$resource->getChoiceForm(),
$resource->getDomainManager(),
$resource->getController(),
$resource->getIdPropertyPath(),
$resource->getLabelPropertyPath(),
];
Expand Down Expand Up @@ -284,14 +294,16 @@ private function createChoiceFormDefinition(ResourceInterface $resource)
*
* @return Definition
*/
private function createControllerDefinition(ResourceInterface $resource)
private function createDomainManagerDefinition(ResourceInterface $resource)
{
$definition = new Definition($resource->getController(), [
$definition = new Definition($resource->getDomainManager(), [
new Reference('lug.resource.'.$resource->getName()),
new Reference('lug.resource.domain.event_dispatcher'),
new Reference('lug.manager.'.$resource->getName()),
new Reference('lug.repository.'.$resource->getName()),
]);

$definition->addMethodCall('setContainer', [new Reference('service_container')]);
$definition->addTag('lug.controller', ['resource' => $resource->getName()]);
$definition->addTag('lug.domain_manager', ['resource' => $resource->getName()]);

return $definition;
}
Expand All @@ -301,16 +313,14 @@ private function createControllerDefinition(ResourceInterface $resource)
*
* @return Definition
*/
private function createDomainManagerDefinition(ResourceInterface $resource)
private function createControllerDefinition(ResourceInterface $resource)
{
$definition = new Definition($resource->getDomainManager(), [
$definition = new Definition($resource->getController(), [
new Reference('lug.resource.'.$resource->getName()),
new Reference('lug.resource.domain.event_dispatcher'),
new Reference('lug.manager.'.$resource->getName()),
new Reference('lug.repository.'.$resource->getName()),
]);

$definition->addTag('lug.domain_manager', ['resource' => $resource->getName()]);
$definition->addMethodCall('setContainer', [new Reference('service_container')]);
$definition->addTag('lug.controller', ['resource' => $resource->getName()]);

return $definition;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Component/Locale/Resource/LocaleResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ public function __construct($controller, $driver = self::DRIVER_DOCTRINE_ORM)
self::DRIVER_MAPPING_FORMAT_XML,
LocaleInterface::class,
Locale::class,
$controller,
Factory::class,
$orm ? DoctrineORMRepository::class : DoctrineMongoDBRepository::class,
DomainManager::class,
Factory::class,
LocaleType::class,
$orm ? DoctrineORMLocaleChoiceType::class : DoctrineMongoDBLocaleChoiceType::class,
DomainManager::class,
$controller,
'code',
'code'
);
Expand Down
8 changes: 4 additions & 4 deletions src/Component/Locale/Tests/Resource/LocaleResourceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ public function testDefaultState()
$this->assertSame(LocaleResource::DRIVER_MAPPING_FORMAT_XML, $this->resource->getDriverMappingFormat());
$this->assertSame([LocaleInterface::class], $this->resource->getInterfaces());
$this->assertSame(Locale::class, $this->resource->getModel());
$this->assertSame(Factory::class, $this->resource->getFactory());
$this->assertSame(DoctrineORMRepository::class, $this->resource->getRepository());
$this->assertSame(Factory::class, $this->resource->getFactory());
$this->assertSame(LocaleType::class, $this->resource->getForm());
$this->assertSame(DoctrineORMLocaleChoiceType::class, $this->resource->getChoiceForm());
$this->assertSame($this->controller, $this->resource->getController());
$this->assertSame(DomainManager::class, $this->resource->getDomainManager());
$this->assertSame($this->controller, $this->resource->getController());
$this->assertSame('code', $this->resource->getLabelPropertyPath());
$this->assertSame('code', $this->resource->getIdPropertyPath());
$this->assertNull($this->resource->getTranslation());
Expand All @@ -83,12 +83,12 @@ public function testMongoDBDriver()
$this->assertSame('default', $this->resource->getDriverManager());
$this->assertSame([LocaleInterface::class], $this->resource->getInterfaces());
$this->assertSame(Locale::class, $this->resource->getModel());
$this->assertSame(Factory::class, $this->resource->getFactory());
$this->assertSame(DoctrineMongoDBRepository::class, $this->resource->getRepository());
$this->assertSame(Factory::class, $this->resource->getFactory());
$this->assertSame(LocaleType::class, $this->resource->getForm());
$this->assertSame(DoctrineMongoDBLocaleChoiceType::class, $this->resource->getChoiceForm());
$this->assertSame($this->controller, $this->resource->getController());
$this->assertSame(DomainManager::class, $this->resource->getDomainManager());
$this->assertSame($this->controller, $this->resource->getController());
$this->assertSame('code', $this->resource->getLabelPropertyPath());
$this->assertSame('code', $this->resource->getIdPropertyPath());
$this->assertNull($this->resource->getTranslation());
Expand Down
Loading