diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle][SecurityBundle] updated configuration to new method names

Browse Source
This commit is contained in:
Johannes M. Schmitt 2012-05-26 12:43:16 -05:00
parent 8775f2c17c
commit 23bb668e26
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
View File

@ -46,7 +46,7 @@ class Configuration implements ConfigurationInterface
$rootNode $rootNode
->children() ->children()
->scalarNode('charset')->setInfo('general configuration')->end() ->scalarNode('charset')->info('general configuration')->end()
->scalarNode('trust_proxy_headers')->defaultFalse()->end() ->scalarNode('trust_proxy_headers')->defaultFalse()->end()
->scalarNode('secret')->isRequired()->end() ->scalarNode('secret')->isRequired()->end()
->scalarNode('ide')->defaultNull()->end() ->scalarNode('ide')->defaultNull()->end()
@ -73,7 +73,7 @@ class Configuration implements ConfigurationInterface
$rootNode $rootNode
->children() ->children()
->arrayNode('form') ->arrayNode('form')
->setInfo('form configuration') ->info('form configuration')
->canBeUnset() ->canBeUnset()
->treatNullLike(array('enabled' => true)) ->treatNullLike(array('enabled' => true))
->treatTrueLike(array('enabled' => true)) ->treatTrueLike(array('enabled' => true))
@ -99,7 +99,7 @@ class Configuration implements ConfigurationInterface
$rootNode $rootNode
->children() ->children()
->arrayNode('esi') ->arrayNode('esi')
->setInfo('esi configuration') ->info('esi configuration')
->canBeUnset() ->canBeUnset()
->treatNullLike(array('enabled' => true)) ->treatNullLike(array('enabled' => true))
->treatTrueLike(array('enabled' => true)) ->treatTrueLike(array('enabled' => true))
@ -116,7 +116,7 @@ class Configuration implements ConfigurationInterface
$rootNode $rootNode
->children() ->children()
->arrayNode('profiler') ->arrayNode('profiler')
->setInfo('profiler configuration') ->info('profiler configuration')
->canBeUnset() ->canBeUnset()
->children() ->children()
->booleanNode('only_exceptions')->defaultFalse()->end() ->booleanNode('only_exceptions')->defaultFalse()->end()
@ -131,8 +131,8 @@ class Configuration implements ConfigurationInterface
->children() ->children()
->scalarNode('ip')->end() ->scalarNode('ip')->end()
->scalarNode('path') ->scalarNode('path')
->setInfo('use the urldecoded format') ->info('use the urldecoded format')
->setExample('^/path to resource/') ->example('^/path to resource/')
->end() ->end()
->scalarNode('service')->end() ->scalarNode('service')->end()
->end() ->end()
@ -148,7 +148,7 @@ class Configuration implements ConfigurationInterface
$rootNode $rootNode
->children() ->children()
->arrayNode('router') ->arrayNode('router')
->setInfo('router configuration') ->info('router configuration')
->canBeUnset() ->canBeUnset()
->children() ->children()
->scalarNode('resource')->isRequired()->end() ->scalarNode('resource')->isRequired()->end()
@ -166,7 +166,7 @@ class Configuration implements ConfigurationInterface
$rootNode $rootNode
->children() ->children()
->arrayNode('session') ->arrayNode('session')
->setInfo('session configuration') ->info('session configuration')
->canBeUnset() ->canBeUnset()
->children() ->children()
->booleanNode('auto_start')->defaultFalse()->end() ->booleanNode('auto_start')->defaultFalse()->end()
@ -182,11 +182,11 @@ class Configuration implements ConfigurationInterface
->scalarNode('gc_probability')->end() ->scalarNode('gc_probability')->end()
->scalarNode('gc_maxlifetime')->end() ->scalarNode('gc_maxlifetime')->end()
->scalarNode('save_path')->defaultValue('%kernel.cache_dir%/sessions')->end() ->scalarNode('save_path')->defaultValue('%kernel.cache_dir%/sessions')->end()
->scalarNode('lifetime')->setInfo('DEPRECATED! Please use: cookie_lifetime')->end() ->scalarNode('lifetime')->info('DEPRECATED! Please use: cookie_lifetime')->end()
->scalarNode('path')->setInfo('DEPRECATED! Please use: cookie_path')->end() ->scalarNode('path')->info('DEPRECATED! Please use: cookie_path')->end()
->scalarNode('domain')->setInfo('DEPRECATED! Please use: cookie_domain')->end() ->scalarNode('domain')->info('DEPRECATED! Please use: cookie_domain')->end()
->booleanNode('secure')->setInfo('DEPRECATED! Please use: cookie_secure')->end() ->booleanNode('secure')->info('DEPRECATED! Please use: cookie_secure')->end()
->booleanNode('httponly')->setInfo('DEPRECATED! Please use: cookie_httponly')->end() ->booleanNode('httponly')->info('DEPRECATED! Please use: cookie_httponly')->end()
->end() ->end()
->end() ->end()
->end() ->end()
@ -218,7 +218,7 @@ class Configuration implements ConfigurationInterface
$rootNode $rootNode
->children() ->children()
->arrayNode('templating') ->arrayNode('templating')
->setInfo('templating configuration') ->info('templating configuration')
->canBeUnset() ->canBeUnset()
->children() ->children()
->scalarNode('assets_version')->defaultValue(null)->end() ->scalarNode('assets_version')->defaultValue(null)->end()
@ -268,7 +268,7 @@ class Configuration implements ConfigurationInterface
->fixXmlConfig('engine') ->fixXmlConfig('engine')
->children() ->children()
->arrayNode('engines') ->arrayNode('engines')
->setExample(array('twig')) ->example(array('twig'))
->isRequired() ->isRequired()
->requiresAtLeastOneElement() ->requiresAtLeastOneElement()
->beforeNormalization() ->beforeNormalization()
@ -331,7 +331,7 @@ class Configuration implements ConfigurationInterface
$rootNode $rootNode
->children() ->children()
->arrayNode('translator') ->arrayNode('translator')
->setInfo('translator configuration') ->info('translator configuration')
->canBeUnset() ->canBeUnset()
->treatNullLike(array('enabled' => true)) ->treatNullLike(array('enabled' => true))
->treatTrueLike(array('enabled' => true)) ->treatTrueLike(array('enabled' => true))
@ -349,7 +349,7 @@ class Configuration implements ConfigurationInterface
$rootNode $rootNode
->children() ->children()
->arrayNode('validation') ->arrayNode('validation')
->setInfo('validation configuration') ->info('validation configuration')
->canBeUnset() ->canBeUnset()
->treatNullLike(array('enabled' => true)) ->treatNullLike(array('enabled' => true))
->treatTrueLike(array('enabled' => true)) ->treatTrueLike(array('enabled' => true))
@ -368,7 +368,7 @@ class Configuration implements ConfigurationInterface
$rootNode $rootNode
->children() ->children()
->arrayNode('annotations') ->arrayNode('annotations')
->setInfo('annotation configuration') ->info('annotation configuration')
->addDefaultsIfNotSet() ->addDefaultsIfNotSet()
->children() ->children()
->scalarNode('cache')->defaultValue('file')->end() ->scalarNode('cache')->defaultValue('file')->end()

14
src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
View File

@ -57,8 +57,8 @@ class MainConfiguration implements ConfigurationInterface
$rootNode $rootNode
->children() ->children()
->scalarNode('access_denied_url')->defaultNull()->setExample('/foo/error403')->end() ->scalarNode('access_denied_url')->defaultNull()->example('/foo/error403')->end()
->scalarNode('session_fixation_strategy')->cannotBeEmpty()->setInfo('strategy can be: none, migrate, invalidate')->defaultValue('migrate')->end() ->scalarNode('session_fixation_strategy')->cannotBeEmpty()->info('strategy can be: none, migrate, invalidate')->defaultValue('migrate')->end()
->booleanNode('hide_user_not_found')->defaultTrue()->end() ->booleanNode('hide_user_not_found')->defaultTrue()->end()
->booleanNode('always_authenticate_before_granting')->defaultFalse()->end() ->booleanNode('always_authenticate_before_granting')->defaultFalse()->end()
->booleanNode('erase_credentials')->defaultTrue()->end() ->booleanNode('erase_credentials')->defaultTrue()->end()
@ -91,7 +91,7 @@ class MainConfiguration implements ConfigurationInterface
->children() ->children()
->scalarNode('connection') ->scalarNode('connection')
->defaultNull() ->defaultNull()
->setInfo('any name configured in doctrine.dbal section') ->info('any name configured in doctrine.dbal section')
->end() ->end()
->arrayNode('cache') ->arrayNode('cache')
->addDefaultsIfNotSet() ->addDefaultsIfNotSet()
@ -156,8 +156,8 @@ class MainConfiguration implements ConfigurationInterface
->scalarNode('requires_channel')->defaultNull()->end() ->scalarNode('requires_channel')->defaultNull()->end()
->scalarNode('path') ->scalarNode('path')
->defaultNull() ->defaultNull()
->setInfo('use the urldecoded format') ->info('use the urldecoded format')
->setExample('^/path to resource/') ->example('^/path to resource/')
->end() ->end()
->scalarNode('host')->defaultNull()->end() ->scalarNode('host')->defaultNull()->end()
->scalarNode('ip')->defaultNull()->end() ->scalarNode('ip')->defaultNull()->end()
@ -300,7 +300,7 @@ class MainConfiguration implements ConfigurationInterface
->fixXmlConfig('provider') ->fixXmlConfig('provider')
->children() ->children()
->arrayNode('providers') ->arrayNode('providers')
->setExample(array( ->example(array(
'memory' => array( 'memory' => array(
'name' => 'memory', 'name' => 'memory',
'users' => array( 'users' => array(
@ -360,7 +360,7 @@ class MainConfiguration implements ConfigurationInterface
->fixXmlConfig('encoder') ->fixXmlConfig('encoder')
->children() ->children()
->arrayNode('encoders') ->arrayNode('encoders')
->setExample(array( ->example(array(
'Acme\DemoBundle\Entity\User1' => 'sha512', 'Acme\DemoBundle\Entity\User1' => 'sha512',
'Acme\DemoBundle\Entity\User2' => array( 'Acme\DemoBundle\Entity\User2' => array(
'algorithm' => 'sha512', 'algorithm' => 'sha512',