Skip to content

Commit

Permalink
[FrameworkBundle][SecurityBundle] updated configuration to new method…
Browse files Browse the repository at this point in the history 
… names
  • Loading branch information
@schmittjoh
schmittjoh committed May 26, 2012
1 parent 8775f2c commit 23bb668
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
36 changes: 18 additions & 18 deletions src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
View file
Expand Up @@ -46,7 +46,7 @@ public function getConfigTreeBuilder()

$rootNode
->children()
->scalarNode('charset')->setInfo('general configuration')->end()
->scalarNode('charset')->info('general configuration')->end()
->scalarNode('trust_proxy_headers')->defaultFalse()->end()
->scalarNode('secret')->isRequired()->end()
->scalarNode('ide')->defaultNull()->end()
Expand All @@ -73,7 +73,7 @@ private function addFormSection(ArrayNodeDefinition $rootNode)
$rootNode
->children()
->arrayNode('form')
->setInfo('form configuration')
->info('form configuration')
->canBeUnset()
->treatNullLike(array('enabled' => true))
->treatTrueLike(array('enabled' => true))
Expand All @@ -99,7 +99,7 @@ private function addEsiSection(ArrayNodeDefinition $rootNode)
$rootNode
->children()
->arrayNode('esi')
->setInfo('esi configuration')
->info('esi configuration')
->canBeUnset()
->treatNullLike(array('enabled' => true))
->treatTrueLike(array('enabled' => true))
Expand All @@ -116,7 +116,7 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
$rootNode
->children()
->arrayNode('profiler')
->setInfo('profiler configuration')
->info('profiler configuration')
->canBeUnset()
->children()
->booleanNode('only_exceptions')->defaultFalse()->end()
Expand All @@ -131,8 +131,8 @@ private function addProfilerSection(ArrayNodeDefinition $rootNode)
->children()
->scalarNode('ip')->end()
->scalarNode('path')
->setInfo('use the urldecoded format')
->setExample('^/path to resource/')
->info('use the urldecoded format')
->example('^/path to resource/')
->end()
->scalarNode('service')->end()
->end()
Expand All @@ -148,7 +148,7 @@ private function addRouterSection(ArrayNodeDefinition $rootNode)
$rootNode
->children()
->arrayNode('router')
->setInfo('router configuration')
->info('router configuration')
->canBeUnset()
->children()
->scalarNode('resource')->isRequired()->end()
Expand All @@ -166,7 +166,7 @@ private function addSessionSection(ArrayNodeDefinition $rootNode)
$rootNode
->children()
->arrayNode('session')
->setInfo('session configuration')
->info('session configuration')
->canBeUnset()
->children()
->booleanNode('auto_start')->defaultFalse()->end()
Expand All @@ -182,11 +182,11 @@ private function addSessionSection(ArrayNodeDefinition $rootNode)
->scalarNode('gc_probability')->end()
->scalarNode('gc_maxlifetime')->end()
->scalarNode('save_path')->defaultValue('%kernel.cache_dir%/sessions')->end()
->scalarNode('lifetime')->setInfo('DEPRECATED! Please use: cookie_lifetime')->end()
->scalarNode('path')->setInfo('DEPRECATED! Please use: cookie_path')->end()
->scalarNode('domain')->setInfo('DEPRECATED! Please use: cookie_domain')->end()
->booleanNode('secure')->setInfo('DEPRECATED! Please use: cookie_secure')->end()
->booleanNode('httponly')->setInfo('DEPRECATED! Please use: cookie_httponly')->end()
->scalarNode('lifetime')->info('DEPRECATED! Please use: cookie_lifetime')->end()
->scalarNode('path')->info('DEPRECATED! Please use: cookie_path')->end()
->scalarNode('domain')->info('DEPRECATED! Please use: cookie_domain')->end()
->booleanNode('secure')->info('DEPRECATED! Please use: cookie_secure')->end()
->booleanNode('httponly')->info('DEPRECATED! Please use: cookie_httponly')->end()
->end()
->end()
->end()
Expand Down Expand Up @@ -218,7 +218,7 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
$rootNode
->children()
->arrayNode('templating')
->setInfo('templating configuration')
->info('templating configuration')
->canBeUnset()
->children()
->scalarNode('assets_version')->defaultValue(null)->end()
Expand Down Expand Up @@ -268,7 +268,7 @@ private function addTemplatingSection(ArrayNodeDefinition $rootNode)
->fixXmlConfig('engine')
->children()
->arrayNode('engines')
->setExample(array('twig'))
->example(array('twig'))
->isRequired()
->requiresAtLeastOneElement()
->beforeNormalization()
Expand Down Expand Up @@ -331,7 +331,7 @@ private function addTranslatorSection(ArrayNodeDefinition $rootNode)
$rootNode
->children()
->arrayNode('translator')
->setInfo('translator configuration')
->info('translator configuration')
->canBeUnset()
->treatNullLike(array('enabled' => true))
->treatTrueLike(array('enabled' => true))
Expand All @@ -349,7 +349,7 @@ private function addValidationSection(ArrayNodeDefinition $rootNode)
$rootNode
->children()
->arrayNode('validation')
->setInfo('validation configuration')
->info('validation configuration')
->canBeUnset()
->treatNullLike(array('enabled' => true))
->treatTrueLike(array('enabled' => true))
Expand All @@ -368,7 +368,7 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode)
$rootNode
->children()
->arrayNode('annotations')
->setInfo('annotation configuration')
->info('annotation configuration')
->addDefaultsIfNotSet()
->children()
->scalarNode('cache')->defaultValue('file')->end()
Expand Down
14 changes: 7 additions & 7 deletions src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
View file
Expand Up @@ -57,8 +57,8 @@ public function getConfigTreeBuilder()

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

0 comments on commit 23bb668

Please sign in to comment.