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

Commit 0eb6ca9

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '2.8' into 3.4
* 2.8: Improved the configuration references Fixed inconsistency differently Update entity_provider.rst
2 parents 2552091 + 7b2dafc commit 0eb6ca9

File tree

6 files changed

+206
-123
lines changed

6 files changed

+206
-123
lines changed

‎reference/configuration/debug.rst

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,12 @@ key in your application configuration.
2525
Configuration
2626
-------------
2727

28+
.. class:: list-config-options
29+
30+
* `dump_destination`_
2831
* `max_items`_
2932
* `min_depth`_
3033
* `max_string_length`_
31-
* `dump_destination`_
3234

3335
max_items
3436
~~~~~~~~~

‎reference/configuration/framework.rst

Lines changed: 146 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -27,116 +27,162 @@ configured under the ``framework`` key in your application configuration.
2727
Configuration
2828
-------------
2929

30-
* `secret`_
31-
* `http_method_override`_
32-
* `ide`_
33-
* `test`_
34-
* `default_locale`_
35-
* `trusted_hosts`_
36-
* :ref:`form <reference-framework-form>`
37-
* :ref:`enabled <reference-form-enabled>`
30+
.. class:: list-config-options list-config-options--complex
31+
32+
* `annotations`_
33+
34+
* :ref:`cache <reference-annotations-cache>`
35+
* `debug`_
36+
* `file_cache_dir`_
37+
38+
* `assets`_
39+
40+
* `base_path`_
41+
* `base_urls`_
42+
* `json_manifest_path`_
43+
* `packages`_
44+
* `version_format`_
45+
* `version_strategy`_
46+
* `version`_
47+
48+
* :ref:`cache <reference-cache>`
49+
50+
* :ref:`app <reference-cache-app>`
51+
* `default_doctrine_provider`_
52+
* `default_memcached_provider`_
53+
* `default_psr6_provider`_
54+
* `default_redis_provider`_
55+
* `directory`_
56+
* `pools`_
57+
* `prefix_seed`_
58+
* `system`_
59+
60+
* :ref:`name <reference-cache-pools-name>`
61+
62+
* `adapter`_
63+
* `clearer`_
64+
* `default_lifetime`_
65+
* `provider`_
66+
* `public`_
67+
3868
* `csrf_protection`_
39-
* :ref:`enabled <reference-csrf_protection-enabled>`
69+
70+
* :ref:`enabled <reference-csrf_protection-enabled>`
71+
72+
* `default_locale`_
4073
* `esi`_
41-
* :ref:`enabled <reference-esi-enabled>`
74+
75+
* :ref:`enabled <reference-esi-enabled>`
76+
77+
* :ref:`form <reference-framework-form>`
78+
79+
* :ref:`enabled <reference-form-enabled>`
80+
4281
* `fragments`_
43-
* :ref:`enabled <reference-fragments-enabled>`
44-
* :ref:`path <reference-fragments-path>`
82+
83+
* :ref:`enabled <reference-fragments-enabled>`
84+
* :ref:`path <reference-fragments-path>`
85+
86+
* `http_method_override`_
87+
* `ide`_
88+
* :ref:`lock <reference-lock>`
89+
* `php_errors`_
90+
91+
* `log`_
92+
* `throw`_
93+
4594
* `profiler`_
46-
* :ref:`enabled <reference-profiler-enabled>`
47-
* `collect`_
48-
* `only_exceptions`_
49-
* `only_master_requests`_
50-
* `dsn`_
51-
* `matcher`_
52-
* `ip`_
53-
* :ref:`path <reference-profiler-matcher-path>`
54-
* `service`_
95+
96+
* `collect`_
97+
* `dsn`_
98+
* :ref:`enabled <reference-profiler-enabled>`
99+
* `matcher`_
100+
101+
* `ip`_
102+
* :ref:`path <reference-profiler-matcher-path>`
103+
* `service`_
104+
105+
* `only_exceptions`_
106+
* `only_master_requests`_
107+
108+
* `property_access`_
109+
110+
* `magic_call`_
111+
* `throw_exception_on_invalid_index`_
112+
55113
* `request`_:
56-
* `formats`_
114+
115+
* `formats`_
116+
57117
* `router`_
58-
* `resource`_
59-
* `type`_
60-
* `http_port`_
61-
* `https_port`_
62-
* `strict_requirements`_
118+
119+
* `http_port`_
120+
* `https_port`_
121+
* `resource`_
122+
* `strict_requirements`_
123+
* `type`_
124+
125+
* `secret`_
126+
* `serializer`_
127+
128+
* :ref:`cache <reference-serializer-cache>`
129+
* :ref:`circular_reference_handler <reference-serializer-circular_reference_handler>`
130+
* :ref:`enable_annotations <reference-serializer-enable_annotations>`
131+
* :ref:`enabled <reference-serializer-enabled>`
132+
* :ref:`mapping <reference-serializer-mapping>`
133+
134+
* :ref:`paths <reference-serializer-mapping-paths>`
135+
136+
* :ref:`name_converter <reference-serializer-name_converter>`
137+
63138
* `session`_
64-
* `storage_id`_
65-
* `handler_id`_
66-
* `name`_
67-
* `cookie_lifetime`_
68-
* `cookie_path`_
69-
* `cookie_domain`_
70-
* `cookie_secure`_
71-
* `cookie_httponly`_
72-
* `gc_divisor`_
73-
* `gc_probability`_
74-
* `gc_maxlifetime`_
75-
* `save_path`_
76-
* `metadata_update_threshold`_
77-
* `assets`_
78-
* `base_path`_
79-
* `base_urls`_
80-
* `packages`_
81-
* `version_strategy`_
82-
* `version`_
83-
* `version_format`_
84-
* `json_manifest_path`_
139+
140+
* `cookie_domain`_
141+
* `cookie_httponly`_
142+
* `cookie_lifetime`_
143+
* `cookie_path`_
144+
* `cookie_secure`_
145+
* `gc_divisor`_
146+
* `gc_maxlifetime`_
147+
* `gc_probability`_
148+
* `handler_id`_
149+
* `metadata_update_threshold`_
150+
* `name`_
151+
* `save_path`_
152+
* `storage_id`_
153+
85154
* `templating`_
86-
* `hinclude_default_template`_
87-
* :ref:`form <reference-templating-form>`
88-
* `resources`_
89-
* :ref:`cache <reference-templating-cache>`
90-
* `engines`_
91-
* `loaders`_
155+
156+
* :ref:`cache <reference-templating-cache>`
157+
* `engines`_
158+
* :ref:`form <reference-templating-form>`
159+
160+
* `resources`_
161+
162+
* `hinclude_default_template`_
163+
* `loaders`_
164+
165+
* `test`_
92166
* `translator`_
93-
* :ref:`enabled <reference-translator-enabled>`
94-
* `fallbacks`_
95-
* `logging`_
96-
* :ref:`paths <reference-translator-paths>`
97-
* `property_access`_
98-
* `magic_call`_
99-
* `throw_exception_on_invalid_index`_
167+
168+
* :ref:`enabled <reference-translator-enabled>`
169+
* `fallbacks`_
170+
* `logging`_
171+
* :ref:`paths <reference-translator-paths>`
172+
173+
* `trusted_hosts`_
174+
* `trusted_proxies`_
100175
* `validation`_
101-
* :ref:`enabled <reference-validation-enabled>`
102-
* :ref:`cache <reference-validation-cache>`
103-
* :ref:`enable_annotations <reference-validation-enable_annotations>`
104-
* `translation_domain`_
105-
* `strict_email`_
106-
* :ref:`mapping <reference-validation-mapping>`
107-
* :ref:`paths <reference-validation-mapping-paths>`
108-
* `annotations`_
109-
* :ref:`cache <reference-annotations-cache>`
110-
* `file_cache_dir`_
111-
* `debug`_
112-
* `serializer`_
113-
* :ref:`enabled <reference-serializer-enabled>`
114-
* :ref:`cache <reference-serializer-cache>`
115-
* :ref:`enable_annotations <reference-serializer-enable_annotations>`
116-
* :ref:`name_converter <reference-serializer-name_converter>`
117-
* :ref:`circular_reference_handler <reference-serializer-circular_reference_handler>`
118-
* :ref:`mapping <reference-serializer-mapping>`
119-
* :ref:`paths <reference-serializer-mapping-paths>`
120-
* `php_errors`_
121-
* `log`_
122-
* `throw`_
123-
* :ref:`cache <reference-cache>`
124-
* :ref:`app <reference-cache-app>`
125-
* `system`_
126-
* `directory`_
127-
* `default_doctrine_provider`_
128-
* `default_psr6_provider`_
129-
* `default_redis_provider`_
130-
* `default_memcached_provider`_
131-
* `pools`_
132-
* :ref:`name <reference-cache-pools-name>`
133-
* `adapter`_
134-
* `public`_
135-
* `default_lifetime`_
136-
* `provider`_
137-
* `clearer`_
138-
* `prefix_seed`_
139-
* :ref:`lock <reference-lock>`
176+
177+
* :ref:`cache <reference-validation-cache>`
178+
* :ref:`enable_annotations <reference-validation-enable_annotations>`
179+
* :ref:`enabled <reference-validation-enabled>`
180+
* :ref:`mapping <reference-validation-mapping>`
181+
182+
* :ref:`paths <reference-validation-mapping-paths>`
183+
184+
* `strict_email`_
185+
* `translation_domain`_
140186

141187
secret
142188
~~~~~~

‎reference/configuration/swiftmailer.rst

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,35 @@ to :doc:`send emails </email>`. All these options are configured under the
2525
Configuration
2626
-------------
2727

28-
* `url`_
29-
* `transport`_
30-
* `username`_
31-
* `password`_
32-
* `command`_
33-
* `host`_
34-
* `port`_
35-
* `timeout`_
36-
* `source_ip`_
37-
* `local_domain`_
38-
* `encryption`_
39-
* `auth_mode`_
40-
* `spool`_
41-
* `type`_
42-
* `path`_
43-
* `sender_address`_
28+
.. class:: list-config-options list-config-options--complex
29+
4430
* `antiflood`_
45-
* `threshold`_
46-
* `sleep`_
31+
32+
* `threshold`_
33+
* `sleep`_
34+
35+
* `auth_mode`_
36+
* `command`_
4737
* `delivery_addresses`_
4838
* `delivery_whitelist`_
4939
* `disable_delivery`_
40+
* `encryption`_
41+
* `host`_
42+
* `local_domain`_
5043
* `logging`_
44+
* `password`_
45+
* `port`_
46+
* `sender_address`_
47+
* `source_ip`_
48+
* `spool`_
49+
50+
* `type`_
51+
* `path`_
52+
53+
* `timeout`_
54+
* `transport`_
55+
* `url`_
56+
* `username`_
5157

5258
url
5359
~~~

‎reference/configuration/twig.rst

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,33 @@ the ``twig`` key in your application configuration.
2525
Configuration
2626
-------------
2727

28+
.. class:: list-config-options list-config-options--complex
29+
30+
* `auto_reload`_
31+
* `autoescape`_
32+
* `autoescape_service`_
33+
* `autoescape_service_method`_
34+
* `base_template_class`_
35+
* `cache`_
36+
* `charset`_
37+
* `date`_
38+
39+
* `format`_
40+
* `interval_format`_
41+
* `timezone`_
42+
43+
* `debug`_
44+
* `exception_controller`_
45+
* `number_format`_
46+
47+
* `decimals`_
48+
* `decimal_point`_
49+
* `thousands_separator`_
50+
51+
* `optimizations`_
52+
* `paths`_
53+
* `strict_variables`_
54+
2855
auto_reload
2956
~~~~~~~~~~~
3057

‎reference/configuration/web_profiler.rst

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ execution and displays it in both the web debug toolbar and the
3030
Configuration
3131
-------------
3232

33-
* `toolbar`_
34-
* `position`_
35-
* `intercept_redirects`_
33+
.. class:: list-config-options
34+
3635
* `excluded_ajax_paths`_
36+
* `intercept_redirects`_
37+
* `position`_
38+
* `toolbar`_
3739
* `verbose`_
3840

3941
toolbar

‎security/entity_provider.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ For this entry, suppose that you already have a ``User`` entity inside an
133133
$this->password,
134134
// see section on salt below
135135
// $this->salt
136-
) = unserialize($serialized, ['allowed_classes' => false]);
136+
) = unserialize($serialized, array('allowed_classes' => false));
137137
}
138138
}
139139

0 commit comments

Comments
 (0)
0