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

Merge branch '2.3' into 2.7

Browse Source 
* 2.3:
  fix YAML syntax in functional tests config
This commit is contained in:
Fabien Potencier 2016-02-16 08:15:42 +01:00
commit 1af6e98851
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml
View File

@ -14,7 +14,7 @@ framework:
only_exceptions: true only_exceptions: true
enabled: false enabled: false
router: router:
resource: %kernel.root_dir%/config/routing.xml resource: '%kernel.root_dir%/config/routing.xml'
type: xml type: xml
session: session:
storage_id: session.storage.native storage_id: session.storage.native
@ -45,7 +45,7 @@ framework:
annotations: annotations:
cache: file cache: file
debug: true debug: true
file_cache_dir: %kernel.cache_dir%/annotations file_cache_dir: '%kernel.cache_dir%/annotations'
serializer: { enabled: true } serializer: { enabled: true }
ide: file%%link%%format ide: file%%link%%format
request: request:

4
src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/config/twig.yml
View File

@ -3,5 +3,5 @@ framework:
# Twig Configuration # Twig Configuration
twig: twig:
debug: %kernel.debug% debug: '%kernel.debug%'
strict_variables: %kernel.debug% strict_variables: '%kernel.debug%'