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

Commit 7510adb

Browse files
javiereguiluzjaviereguiluz
committed
Merge branch '3.4' into 4.0
* 3.4: Improved the configuration references Fixed inconsistency differently Update entity_provider.rst Update scheme.rst
2 parents c031065 + 0eb6ca9 commit 7510adb

File tree

7 files changed

+197
-115
lines changed

7 files changed

+197
-115
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: 137 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -27,111 +27,156 @@ 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+
58+
* :ref:`name <reference-cache-pools-name>`
59+
60+
* `adapter`_
61+
* `clearer`_
62+
* `default_lifetime`_
63+
* `provider`_
64+
* `public`_
65+
66+
* `prefix_seed`_
67+
* `system`_
68+
3869
* `csrf_protection`_
39-
* :ref:`enabled <reference-csrf_protection-enabled>`
70+
71+
* :ref:`enabled <reference-csrf_protection-enabled>`
72+
73+
* `default_locale`_
4074
* `esi`_
41-
* :ref:`enabled <reference-esi-enabled>`
75+
76+
* :ref:`enabled <reference-esi-enabled>`
77+
78+
* :ref:`form <reference-framework-form>`
79+
80+
* :ref:`enabled <reference-form-enabled>`
81+
4282
* `fragments`_
43-
* :ref:`enabled <reference-fragments-enabled>`
44-
* :ref:`path <reference-fragments-path>`
83+
84+
* :ref:`enabled <reference-fragments-enabled>`
85+
* :ref:`path <reference-fragments-path>`
86+
87+
* `http_method_override`_
88+
* `ide`_
89+
* :ref:`lock <reference-lock>`
90+
* `php_errors`_
91+
92+
* `log`_
93+
* `throw`_
94+
4595
* `profiler`_
46-
* :ref:`enabled <reference-profiler-enabled>`
96+
4797
* `collect`_
98+
* `dsn`_
99+
* :ref:`enabled <reference-profiler-enabled>`
48100
* `only_exceptions`_
49101
* `only_master_requests`_
50-
* `dsn`_
102+
103+
* `property_access`_
104+
105+
* `magic_call`_
106+
* `throw_exception_on_invalid_index`_
107+
51108
* `request`_:
52-
* `formats`_
109+
110+
* `formats`_
111+
53112
* `router`_
54-
* `resource`_
55-
* `type`_
56-
* `http_port`_
57-
* `https_port`_
58-
* `strict_requirements`_
113+
114+
* `http_port`_
115+
* `https_port`_
116+
* `resource`_
117+
* `strict_requirements`_
118+
* `type`_
119+
120+
* `secret`_
121+
* `serializer`_
122+
123+
* :ref:`circular_reference_handler <reference-serializer-circular_reference_handler>`
124+
* :ref:`enable_annotations <reference-serializer-enable_annotations>`
125+
* :ref:`enabled <reference-serializer-enabled>`
126+
* :ref:`mapping <reference-serializer-mapping>`
127+
128+
* :ref:`paths <reference-serializer-mapping-paths>`
129+
130+
* :ref:`name_converter <reference-serializer-name_converter>`
131+
59132
* `session`_
60-
* `storage_id`_
61-
* `handler_id`_
62-
* `name`_
63-
* `cookie_lifetime`_
64-
* `cookie_path`_
65-
* `cookie_domain`_
66-
* `cookie_secure`_
67-
* `cookie_httponly`_
68-
* `gc_divisor`_
69-
* `gc_probability`_
70-
* `gc_maxlifetime`_
71-
* `save_path`_
72-
* `metadata_update_threshold`_
73-
* `assets`_
74-
* `base_path`_
75-
* `base_urls`_
76-
* `packages`_
77-
* `version_strategy`_
78-
* `version`_
79-
* `version_format`_
80-
* `json_manifest_path`_
133+
134+
* `cookie_domain`_
135+
* `cookie_httponly`_
136+
* `cookie_lifetime`_
137+
* `cookie_path`_
138+
* `cookie_secure`_
139+
* `gc_divisor`_
140+
* `gc_maxlifetime`_
141+
* `gc_probability`_
142+
* `handler_id`_
143+
* `metadata_update_threshold`_
144+
* `name`_
145+
* `save_path`_
146+
* `storage_id`_
147+
81148
* `templating`_
82-
* `hinclude_default_template`_
83-
* :ref:`form <reference-templating-form>`
84-
* `resources`_
85-
* :ref:`cache <reference-templating-cache>`
86-
* `engines`_
87-
* `loaders`_
149+
150+
* :ref:`cache <reference-templating-cache>`
151+
* `engines`_
152+
* :ref:`form <reference-templating-form>`
153+
154+
* `resources`_
155+
156+
* `hinclude_default_template`_
157+
* `loaders`_
158+
159+
* `test`_
88160
* `translator`_
89-
* :ref:`enabled <reference-translator-enabled>`
90-
* `fallbacks`_
91-
* `logging`_
92-
* :ref:`paths <reference-translator-paths>`
93-
* `property_access`_
94-
* `magic_call`_
95-
* `throw_exception_on_invalid_index`_
161+
162+
* :ref:`enabled <reference-translator-enabled>`
163+
* `fallbacks`_
164+
* `logging`_
165+
* :ref:`paths <reference-translator-paths>`
166+
167+
* `trusted_hosts`_
168+
* `trusted_proxies`_
96169
* `validation`_
97-
* :ref:`enabled <reference-validation-enabled>`
98-
* :ref:`cache <reference-validation-cache>`
99-
* :ref:`enable_annotations <reference-validation-enable_annotations>`
100-
* `translation_domain`_
101-
* `strict_email`_
102-
* :ref:`mapping <reference-validation-mapping>`
103-
* :ref:`paths <reference-validation-mapping-paths>`
104-
* `annotations`_
105-
* :ref:`cache <reference-annotations-cache>`
106-
* `file_cache_dir`_
107-
* `debug`_
108-
* `serializer`_
109-
* :ref:`enabled <reference-serializer-enabled>`
110-
* :ref:`enable_annotations <reference-serializer-enable_annotations>`
111-
* :ref:`name_converter <reference-serializer-name_converter>`
112-
* :ref:`circular_reference_handler <reference-serializer-circular_reference_handler>`
113-
* :ref:`mapping <reference-serializer-mapping>`
114-
* :ref:`paths <reference-serializer-mapping-paths>`
115-
* `php_errors`_
116-
* `log`_
117-
* `throw`_
118-
* :ref:`cache <reference-cache>`
119-
* :ref:`app <reference-cache-app>`
120-
* `system`_
121-
* `directory`_
122-
* `default_doctrine_provider`_
123-
* `default_psr6_provider`_
124-
* `default_redis_provider`_
125-
* `default_memcached_provider`_
126-
* `pools`_
127-
* :ref:`name <reference-cache-pools-name>`
128-
* `adapter`_
129-
* `public`_
130-
* `default_lifetime`_
131-
* `provider`_
132-
* `clearer`_
133-
* `prefix_seed`_
134-
* :ref:`lock <reference-lock>`
170+
171+
* :ref:`cache <reference-validation-cache>`
172+
* :ref:`enable_annotations <reference-validation-enable_annotations>`
173+
* :ref:`enabled <reference-validation-enabled>`
174+
* :ref:`mapping <reference-validation-mapping>`
175+
176+
* :ref:`paths <reference-validation-mapping-paths>`
177+
178+
* `strict_email`_
179+
* `translation_domain`_
135180

136181
secret
137182
~~~~~~

‎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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ execution and displays it in both the web debug toolbar and the
3030
Configuration
3131
-------------
3232

33-
* `toolbar`_
34-
* `intercept_redirects`_
33+
.. class:: list-config-options
34+
3535
* `excluded_ajax_paths`_
36+
* `intercept_redirects`_
37+
* `toolbar`_
3638

3739
toolbar
3840
~~~~~~~

‎routing/scheme.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ the URI scheme via schemes:
1616
namespace App\Controller;
1717
1818
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
19-
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
19+
use Symfony\Component\Routing\Annotation\Route;
2020
2121
class MainController extends Controller
2222
{

‎security/entity_provider.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ with the following fields: ``id``, ``username``, ``password``,
130130
$this->password,
131131
// see section on salt below
132132
// $this->salt
133-
) = unserialize($serialized, ['allowed_classes' => false]);
133+
) = unserialize($serialized, array('allowed_classes' => false));
134134
}
135135
}
136136

0 commit comments

Comments
 (0)
0