Skip to content

Commit 391d8d0

Browse files
Merge branch '2.8' into 3.0
* 2.8: [PhpUnitBridge] Revert 7f62133939b1172e1c9924d211e1d315230b3be8 bumped Symfony version to 2.3.40 set s-maxage only if all responses are cacheable updated VERSION for 2.3.39 update CONTRIBUTORS for 2.3.39 updated CHANGELOG for 2.3.39 Improved the "branch" row of the PR table [Debug] Replaced logic for detecting filesystem case sensitivity [Process] Wait a bit less on Windows Use debug member variable Autowiring the concrete class too - consistent with behavior of other services Fix typos #18090 1. PHPs session design to PHP's session design 2. Symfony HttpKernel offers to Symfony's HttpKernel offers 3. in which case it it should to in which case it should Fix for Isssue #18091 replace perfom by perform minor #18088 Fix typo for profiler [Validator] Fixing inaccurate typehint in docblock [ci] remove token for composer now that rate limiting is off Conflicts: CHANGELOG-2.3.md src/Symfony/Bridge/PhpUnit/composer.json
2 parents 38e5b5f + 7ccc0d2 commit 391d8d0

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ private function addAnnotationsSection(ArrayNodeDefinition $rootNode)
482482
->children()
483483
->scalarNode('cache')->defaultValue('file')->end()
484484
->scalarNode('file_cache_dir')->defaultValue('%kernel.cache_dir%/annotations')->end()
485-
->booleanNode('debug')->defaultValue('%kernel.debug%')->end()
485+
->booleanNode('debug')->defaultValue($this->debug)->end()
486486
->end()
487487
->end()
488488
->end()

Resources/config/services.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
<service id="service_container" synthetic="true">
3333
<autowiring-type>Symfony\Component\DependencyInjection\ContainerInterface</autowiring-type>
34+
<autowiring-type>Symfony\Component\DependencyInjection\Container</autowiring-type>
3435
</service>
3536

3637
<service id="kernel" synthetic="true" />

Tests/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ protected static function getBundleDefaultConfig()
163163
'annotations' => array(
164164
'cache' => 'file',
165165
'file_cache_dir' => '%kernel.cache_dir%/annotations',
166-
'debug' => '%kernel.debug%',
166+
'debug' => true,
167167
),
168168
'serializer' => array(
169169
'enabled' => false,

0 commit comments

Comments
 (0)