8000 Merge branch '4.1' · symfony/symfony-docs@9f55230 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9f55230

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '4.1'
* 4.1: Fixed more sorting issues in config options Removed the full config dump of FrameworkBundle
2 parents 2dc7cd1 + b6473e2 commit 9f55230

File tree

2 files changed

+2
-166
lines changed

2 files changed

+2
-166
lines changed

‎reference/configuration/framework.rst

Lines changed: 0 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -1985,170 +1985,6 @@ lock
19851985
The default lock adapter. If not defined, the value is set to ``semaphore`` when
19861986
available, or to ``flock`` otherwise. Store's DSN are also allowed.
19871987

1988-
Full Default Configuration
1989-
--------------------------
1990-
1991-
.. configuration-block::
1992-
1993-
.. code-block:: yaml
1994-
1995-
framework:
1996-
secret: ~
1997-
http_method_override: true
1998-
trusted_proxies: []
1999-
ide: ~
2000-
test: ~
2001-
default_locale: en
2002-
2003-
csrf_protection:
2004-
enabled: false
2005-
2006-
# form configuration
2007-
form:
2008-
enabled: false
2009-
csrf_protection:
2010-
enabled: true
2011-
field_name: ~
2012-
2013-
# esi configuration
2014-
esi:
2015-
enabled: false
2016-
2017-
# fragments configuration
2018-
fragments:
2019-
enabled: false
2020-
path: /_fragment
2021-
2022-
# profiler configuration
2023-
profiler:
2024-
enabled: false
2025-
collect: true
2026-
only_exceptions: false
2027-
only_master_requests: false
2028-
dsn: file:%kernel.cache_dir%/profiler
2029-
2030-
# router configuration
2031-
router:
2032-
resource: ~ # Required
2033-
type: 10000 ~
2034-
http_port: 80
2035-
https_port: 443
2036-
2037-
# * set to true to throw an exception when a parameter does not
2038-
# match the requirements
2039-
# * set to false to disable exceptions when a parameter does not
2040-
# match the requirements (and return null instead)
2041-
# * set to null to disable parameter checks against requirements
2042-
#
2043-
# 'true' is the preferred configuration in development mode, while
2044-
# 'false' or 'null' might be preferred in production
2045-
strict_requirements: true
2046-
2047-
# session configuration
2048-
session:
2049-
storage_id: session.storage.native
2050-
handler_id: session.handler.native_file
2051-
name: ~
2052-
cookie_lifetime: ~
2053-
cookie_path: ~
2054-
cookie_domain: ~
2055-
cookie_secure: ~
2056-
cookie_httponly: ~
2057-
gc_divisor: ~
2058-
gc_probability: ~
2059-
gc_maxlifetime: ~
2060-
save_path: '%kernel.cache_dir%/sessions'
2061-
2062-
# serializer configuration
2063-
serializer:
2064-
enabled: false
2065-
cache: ~
2066-
name_converter: ~
2067-
circular_reference_handler: ~
2068-
2069-
# assets configuration
2070-
assets:
2071-
base_path: ~
2072-
base_urls: []
2073-
version: ~
2074-
version_format: '%%s?%%s'
2075-
packages:
2076-
2077-
# Prototype
2078-
name:
2079-
base_path: ~
2080-
base_urls: []
2081-
version: ~
2082-
version_format: '%%s?%%s'
2083-
2084-
# templating configuration
2085-
templating:
2086-
hinclude_default_template: ~
2087-
form:
2088-
resources:
2089-
2090-
# Default:
2091-
- FrameworkBundle:Form
2092-
cache: ~
2093-
engines: # Required
2094-
2095-
# Example:
2096-
- twig
2097-
loaders: []
2098-
2099-
# translator configuration
2100-
translator:
2101-
enabled: false
2102-
fallbacks: [en]
2103-
logging: "%kernel.debug%"
2104-
paths: []
2105-
2106-
# validation configuration
2107-
validation:
2108-
enabled: false
2109-
cache: ~
2110-
enable_annotations: false
2111-
translation_domain: validators
2112-
mapping:
2113-
paths: []
2114-
2115-
# annotation configuration
2116-
annotations:
2117-
cache: file
2118-
file_cache_dir: '%kernel.cache_dir%/annotations'
2119-
debug: '%kernel.debug%'
2120-
2121-
# PHP errors handling configuration
2122-
php_errors:
2123-
log: false
2124-
throw: '%kernel.debug%'
2125-
2126-
# cache configuration
2127-
cache:
2128-
app: cache.adapter.filesystem
2129-
system: cache.adapter.system
2130-
directory: '%kernel.cache_dir%/pools'
2131-
default_doctrine_provider: ~
2132-
default_psr6_provider: ~
2133-
default_redis_provider: 'redis://localhost'
2134-
default_memcached_provider: 'memcached://localhost'
2135-
pools:
2136-
# Prototype
2137-
name:
2138-
adapter: cache.app
2139-
public: false
2140-
default_lifetime: ~
2141-
provider: ~
2142-
clearer: ~
2143-
2144-
# lock configuration
2145-
lock:
2146-
invoice: 'redis://localhost'
2147-
report: semaphore
2148-
# lock: ~
2149-
# lock: 'flock'
2150-
# lock: ['semaphore', 'redis://localhost']
2151-
21521988
.. _`HTTP Host header attacks`: http://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html
21531989
.. _`Security Advisory Blog post`: https://symfony.com/blog/security-releases-symfony-2-0-24-2-1-12-2-2-5-and-2-3-3-released#cve-2013-4752-request-gethost-poisoning
21541990
.. _`Doctrine Cache`: http://docs.doctrine-project.org/projects/doctrine-common/en/latest/reference/caching.html

‎reference/configuration/swiftmailer.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ Configuration
2929

3030
* `antiflood`_
3131

32-
* `threshold`_
3332
* `sleep`_
33+
* `threshold`_
3434

3535
* `auth_mode`_
3636
* `command`_
@@ -47,8 +47,8 @@ Configuration
4747
* `source_ip`_
4848
* `spool`_
4949

50-
* `type`_
5150
* `path`_
51+
* `type`_
5252

5353
* `timeout`_
5454
* `transport`_

0 commit comments

Comments
 (0)
0