8000 Merge branch '3.4' into 4.0 · symfony/symfony-docs@1351077 · GitHub
[go: up one dir, main page]
Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1351077

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '3.4' into 4.0
* 3.4: Fixed more sorting issues in config options Removed the full config dump of FrameworkBundle
2 parents 4ca2f8b + 7e849aa commit 1351077

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
@@ -1935,170 +1935,6 @@ lock
19351935
The default lock adapter. If not defined, the value is set to ``semaphore`` when
19361936
available, or to ``flock`` otherwise. Store's DSN are also allowed.
19371937

1938-
Full Default Configuration
1939-
--------------------------
1940-
1941-
.. configuration-block::
1942-
1943-
.. code-block:: yaml
1944-
1945-
framework:
1946-
secret: ~
1947-
http_method_override: true
1948-
trusted_proxies: []
1949-
ide: ~
1950-
test: ~
1951-
default_locale: en
1952-
1953-
csrf_protection:
1954-
enabled: false
1955-
1956-
# form configuration
1957-
form:
1958-
enabled: false
1959-
csrf_protection:
1960-
enabled: true
1961-
field_name: ~
1962-
1963-
# esi configuration
1964-
esi:
1965-
enabled: false
1966-
1967-
# fragments configuration
1968-
fragments:
1969-
enabled: false
1970-
path: /_fragment
1971-
1972-
# profiler configuration
1973-
profiler:
1974-
enabled: false
1975-
collect: true
1976-
only_exceptions: false
1977-
only_master_requests: false
1978-
dsn: file:%kernel.cache_dir%/profiler
1979-
1980-
# router configuration
1981-
router:
1982-
resource: ~ # Required
1983-
type: ~
1984-
http_port: 80
1985-
https_port: 443
1986-
1987-
# * set to true to throw an exception when a parameter does not
1988-
# match the requirements
1989-
# * set to false to disable exceptions when a parameter does not
1990-
# match the requirements (and return null instead)
1991-
# * set to null to disable parameter checks against requirements
1992-
#
1993-
# 'true' is the preferred configuration in development mode, while
1994-
# 'false' or 'null' might be preferred in production
1995-
strict_requirements: true
1996-
1997-
# session configuration
1998-
session:
1999-
storage_id: session.storage.native
2000-
handler_id: session.handler.native_file
2001-
name: ~
2002-
cookie_lifetime: ~
2003-
cookie_path: ~
2004-
cookie_domain: ~
2005-
cookie_secure: ~
2006-
cookie_httponly: ~
2007-
gc_divisor: ~
2008-
gc_probability: ~
2009-
gc_maxlifetime: ~
2010-
save_path: '%kernel.cache_dir%/sessions'
2011-
2012-
# serializer configuration
2013-
serializer:
2014-
enabled: false
2015-
cache: ~
2016-
name_converter: ~
2017-
circular_reference_handler: ~
2018-
2019-
# assets configuration
2020-
assets:
2021-
base_path: ~
2022-
base_urls: []
2023-
version: ~
2024-
version_format: '%%s?%%s'
2025-
packages:
2026-
2027-
# Prototype
2028-
name:
2029-
base_path: ~
2030-
base_urls: []
2031-
version: ~
2032-
version_format: '%%s?%%s'
2033-
2034-
# templating configuration
2035-
templating:
2036-
hinclude_default_template: ~
2037-
form:
2038-
resources:
2039-
2040-
# Default:
2041-
- FrameworkBundle:Form
2042-
cache: ~
2043-
engines: # Required
2044-
2045-
# Example:
2046-
- twig
2047-
loaders: []
2048-
2049-
# translator configuration
2050-
translator:
2051-
enabled: false
2052-
fallbacks: [en]
2053-
logging: "%kernel.debug%"
2054-
paths: []
2055-
2056-
# validation configuration
2057-
validation:
2058-
enabled: false
2059-
cache: ~
2060-
enable_annotations: false
2061-
translation_domain: validators
2062-
mapping:
2063-
paths: []
2064-
2065-
# annotation configuration
2066-
annotations:
2067-
cache: file
2068-
file_cache_dir: '%kernel.cache_dir%/annotations'
2069-
debug: '%kernel.debug%'
2070-
2071-
# PHP errors handling configuration
2072-
php_errors:
2073-
log: false
2074-
throw: '%kernel.debug%'
2075-
2076-
# cache configuration
2077-
cache:
2078-
app: cache.adapter.filesystem
2079-
system: cache.adapter.system
2080-
directory: '%kernel.cache_dir%/pools'
2081-
default_doctrine_provider: ~
2082-
default_psr6_provider: ~
2083-
default_redis_provider: 'redis://localhost'
2084-
default_memcached_provider: 'memcached://localhost'
2085-
pools:
2086-
# Prototype
2087-
name:
2088-
adapter: cache.app
2089-
public: false
2090-
default_lifetime: ~
2091-
provider: ~
2092-
clearer: ~
2093-
2094-
# lock configuration
2095-
lock:
2096-
invoice: 'redis://localhost'
2097-
report: semaphore
2098-
# lock: ~
2099-
# lock: 'flock'
2100-
# lock: ['semaphore', 'redis://localhost']
2101-
21021938
.. _`HTTP Host header attacks`: http://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html
21031939
.. _`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
21041940
.. _`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