Skip to content

Commit 161ab33

Browse files
committed
Added canBeEnabled() opt-in on all config
1 parent 00dbc21 commit 161ab33

File tree

1 file changed

+10
-24
lines changed

1 file changed

+10
-24
lines changed

src/DependencyInjection/Configuration.php

Lines changed: 10 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,9 @@ private function addSessionSupportSection()
5656
$node = $tree->root('session');
5757

5858
$node
59+
->canBeEnabled()
5960
->addDefaultsIfNotSet()
6061
->children()
61-
->booleanNode('enabled')
62-
->defaultFalse()
63-
->end()
6462
->scalarNode('service_id')->isRequired()->end()
6563
->scalarNode('prefix')
6664
->defaultValue('session_')
@@ -82,12 +80,10 @@ private function addSerializerSection()
8280
$node = $tree->root('serializer');
8381

8482
$node
83+
->canBeEnabled()
8584
->addDefaultsIfNotSet()
8685
->children()
87-
->booleanNode('enabled')
88-
->defaultFalse()
89-
->end()
90-
->scalarNode('service_id')->isRequired()->end()
86+
->scalarNode('service_id')->isRequired()->end()
9187
->booleanNode('use_tagging')->defaultTrue()->end()
9288
->end();
9389

@@ -105,11 +101,9 @@ private function addValidationSection()
105101
$node = $tree->root('validation');
106102

107103
$node
104+
->canBeEnabled()
108105
->addDefaultsIfNotSet()
109106
->children()
110-
->booleanNode('enabled')
111-
->defaultFalse()
112-
->end()
113107
->scalarNode('service_id')->isRequired()->end()
114108
->booleanNode('use_tagging')->defaultTrue()->end()
115109
->end();
@@ -128,11 +122,9 @@ private function addAnnotationSection()
128122
$node = $tree->root('annotation');
129123

130124
$node
125+
->canBeEnabled()
131126
->addDefaultsIfNotSet()
132127
->children()
133-
->booleanNode('enabled')
134-
->defaultFalse()
135-
->end()
136128
->scalarNode('service_id')->isRequired()->end()
137129
->booleanNode('use_tagging')->defaultTrue()->end()
138130
->end();
@@ -149,11 +141,9 @@ private function addLoggingSection()
149141
$node = $tree->root('logging');
150142

151143
$node
144+
->canBeEnabled()
152145
->addDefaultsIfNotSet()
153146
->children()
154-
->booleanNode('enabled')
155-
->defaultFalse()
156-
->end()
157147
->scalarNode('logger')->defaultValue('logger')->end()
158148
->scalarNode('level')->defaultValue('info')->end()
159149
->end();
@@ -172,12 +162,9 @@ private function addDoctrineSection()
172162
$node = $tree->root('doctrine');
173163

174164
$node
165+
->canBeEnabled()
175166
->addDefaultsIfNotSet()
176167
->children()
177-
->booleanNode('enabled')
178-
->defaultFalse()
179-
->isRequired()
180-
->end()
181168
->booleanNode('use_tagging')
182169
->defaultTrue()
183170
->end()
@@ -231,11 +218,10 @@ private function addRouterSection()
231218
$tree = new TreeBuilder();
232219
$node = $tree->root('router');
233220

234-
$node->addDefaultsIfNotSet()
221+
$node
222+
->canBeEnabled()
223+
->addDefaultsIfNotSet()
235224
->children()
236-
->booleanNode('enabled')
237-
->defaultFalse()
238-
->end()
239225
->integerNode('ttl')
240226
->defaultValue(604800)
241227
->end()

0 commit comments

Comments
 (0)