Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[DIC] Better handling of enableable configurations #6852

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

Closed
wants to merge 12 commits into from
Closed

[DIC] Better handling of enableable configurations #6852

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
728dd93
[FrameworkBundle] Fix the DI config
vicb Jan 23, 2013
868dc27
[DIC] tweaks
vicb Jan 23, 2013
2c2521a
[WIP][DIC] Better handling of enableable array nodes
vicb Jan 23, 2013
ccbabff
implement feedback
vicb Jan 24, 2013
1fb6ede
[FrameworkBundle] Fix the configuration info
vicb Jan 25, 2013
30167b3
fixes
vicb Jan 25, 2013
4979960
tweak the enableable nodes
vicb Jan 25, 2013
f714095
[Config] Tweak tests
vicb Jan 28, 2013
ea94ab0
[Config] Tweak the Processor
vicb Jan 28, 2013
1f540c0
[ArrayNode] Allow explicitely disabling Enableable nodes, UTs
vicb Jan 28, 2013
c274274
[FrameworkBundle] Update the UTs
vicb Jan 28, 2013
58f221a
[Config] Fix the changelog
vicb Jan 28, 2013
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
Prev Previous commit
Next Next commit
implement feedback
  • Loading branch information
@vicb
vicb committed Jan 24, 2013
commit ccbabffbf1a2e0fe022cc78261b86effc53668cc
10 changes: 5 additions & 5 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,10 @@ private function registerFormConfiguration($config, ContainerBuilder $container,
}
$loader->load('form_csrf.xml');

$container->setParameter('form.type_extension.csrf.enabled', $config['csrf_protection']['enabled']);
$container->setParameter('form.type_extension.csrf.enabled', true);
$container->setParameter('form.type_extension.csrf.field_name', $config['csrf_protection']['field_name']);
} else {
$container->setParameter('form.type_extension.csrf.enabled', false);
}
}

Expand Down Expand Up @@ -203,6 +205,8 @@ private function registerRouterProxyConfiguration(array $config, ContainerBuilde
private function registerProfilerConfiguration(array $config, ContainerBuilder $container, XmlFileLoader $loader)
{
if (!$this->isConfigEnabled($container, $config)) {
$container->getDefinition('profiler')->addMethodCall('disable', array());

return;
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this doesn't harmonize with what is done in line 254:

if (!$config['enabled']) {
    $container->getDefinition('profiler')->addMethodCall('disable', array());
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@Tobion could you submit a PR please ?

}

Expand Down Expand Up @@ -250,10 +254,6 @@ private function registerProfilerConfiguration(array $config, ContainerBuilder $
}
}
}

if (!$config['enabled']) {
$container->getDefinition('profiler')->addMethodCall('disable', array());
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Config/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CHANGELOG
-----

* [BC BREAK] changed ArrayNodeDefinition::canBeEnabled() and ArrayNodeDefinition::canBeDisabled()
Copy link
Member

Choose a reason for hiding this comment

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

Actually, this is not a BC break as those methods have been introduced in 2.2 (see #5688). So, this can be replaced with something like "added ArrayNodeDefinition::canBeEnabled() and ArrayNodeDefinition::canBeDisabled() to simplify optional configuration management"

to set the defaults when the node is not set - the methods were ineffective
to add the defaults when the node is not set - the methods were ineffective
if ArrayNodeDefinition::setDefaultsIfNotSet() was not explicitely called.
Copy link
Contributor

Choose a reason for hiding this comment

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

Small typo here add not set.

Regarding the change itself, it seems fine to me.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for the review, I'll update tomorrow

* added a `normalizeKeys()` method for array nodes (to avoid key normalization)
* added numerical type handling for config definitions
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Component/DependencyInjection/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ CHANGELOG
2.2.0
-----

* added Extension::isConfigEnabled() to ease working with enableable configurations
* added an Extension base class with sensible defaults to be used in conjunction
with the Config component.
* added PrependExtensionInterface (to be able to allow extensions to prepend
Expand Down