Merge branch '2.7' into 2.8
* 2.7: [FrameworkBundle] fix YAML syntax fix YAML syntax in functional tests config
This commit is contained in:
commit
15ecc7bf63
@ -1,7 +1,7 @@
|
|||||||
framework:
|
framework:
|
||||||
assets:
|
assets:
|
||||||
version: SomeVersionScheme
|
version: SomeVersionScheme
|
||||||
version_format: %%s?version=%%s
|
version_format: '%%s?version=%%s'
|
||||||
base_urls: http://cdn.example.com
|
base_urls: http://cdn.example.com
|
||||||
packages:
|
packages:
|
||||||
images_path:
|
images_path:
|
||||||
@ -11,7 +11,7 @@ framework:
|
|||||||
base_urls: ["http://images1.example.com", "http://images2.example.com"]
|
base_urls: ["http://images1.example.com", "http://images2.example.com"]
|
||||||
foo:
|
foo:
|
||||||
version: 1.0.0
|
version: 1.0.0
|
||||||
version_format: %%s-%%s
|
version_format: '%%s-%%s'
|
||||||
bar:
|
bar:
|
||||||
base_urls: ["https://bar2.example.com"]
|
base_urls: ["https://bar2.example.com"]
|
||||||
bar_null_version:
|
bar_null_version:
|
||||||
|
@ -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
|
||||||
@ -47,7 +47,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:
|
serializer:
|
||||||
enabled: true
|
enabled: true
|
||||||
enable_annotations: true
|
enable_annotations: true
|
||||||
|
@ -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%'
|
||||||
|
Reference in New Issue
Block a user