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

Commit 4e0f567

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

File tree

7 files changed

+195
-113
lines changed

7 files changed

+195
-113
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: 135 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -27,113 +27,158 @@ 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+
* `tags`_
66+
67+
* `prefix_seed`_
68+
* `system`_
69+
3870
* `csrf_protection`_
39-
* :ref:`enabled <reference-csrf_protection-enabled>`
71+
72+
* :ref:`enabled <reference-csrf_protection-enabled>`
73+
74+
* `default_locale`_
4075
* `esi`_
41-
* :ref:`enabled <reference-esi-enabled>`
76+
77+
* :ref:`enabled <reference-esi-enabled>`
78+
79+
* :ref:`form <reference-framework-form>`
80+
81+
* :ref:`enabled <reference-form-enabled>`
82+
4283
* `fragments`_
43-
* :ref:`enabled <reference-fragments-enabled>`
44-
* :ref:`path <reference-fragments-path>`
84+
85+
* :ref:`enabled <reference-fragments-enabled>`
86+
* :ref:`path <reference-fragments-path>`
87+
88+
* `http_method_override`_
89+
* `ide`_
90+
* :ref:`lock <reference-lock>`
91+
* `php_errors`_
92+
93+
* `log`_
94+
* `throw`_
95+
4596
* `profiler`_
46-
* :ref:`enabled <reference-profiler-enabled>`
97+
4798
* `collect`_
99+
* `dsn`_
100+
* :ref:`enabled <reference-profiler-enabled>`
48101
* `only_exceptions`_
49102
* `only_master_requests`_
50-
* `dsn`_
103+
104+
* `property_access`_
105+
106+
* `magic_call`_
107+
* `throw_exception_on_invalid_index`_
108+
51109
* `request`_:
52-
* `formats`_
110+
111+
* `formats`_
112+
53113
* `router`_
54-
* `resource`_
55-
* `type`_
56-
* `http_port`_
57-
* `https_port`_
58-
* `strict_requirements`_
114+
115+
* `http_port`_
116+
* `https_port`_
117+
* `resource`_
118+
* `strict_requirements`_
119+
* `type`_
120+
121+
* `secret`_
122+
* `serializer`_
123+
124+
* :ref:`circular_reference_handler <reference-serializer-circular_reference_handler>`
125+
* :ref:`enable_annotations <reference-serializer-enable_annotations>`
126+
* :ref:`enabled <reference-serializer-enabled>`
127+
* :ref:`mapping <reference-serializer-mapping>`
128+
129+
* :ref:`paths <reference-serializer-mapping-paths>`
130+
131+
* :ref:`name_converter <reference-serializer-name_converter>`
132+
59133
* `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`_
134+
135+
* `cookie_domain`_
136+
* `cookie_httponly`_
137+
* `cookie_lifetime`_
138+
* `cookie_path`_
139+
* `cookie_secure`_
140+
* `gc_divisor`_
141+
* `gc_maxlifetime`_
142+
* `gc_probability`_
143+
* `handler_id`_
144+
* `metadata_update_threshold`_
145+
* `name`_
146+
* `save_path`_
147+
* `storage_id`_
148+
81149
* `templating`_
82-
* `hinclude_default_template`_
83-
* :ref:`form <reference-templating-form>`
84-
* `resources`_
85-
* :ref:`cache <reference-templating-cache>`
86-
* `engines`_
87-
* `loaders`_
150+
151+
* :ref:`cache <reference-templating-cache>`
152+
* `engines`_
153+
* :ref:`form <reference-templating-form>`
154+
155+
* `resources`_
156+
157+
* `hinclude_default_template`_
158+
* `loaders`_
159+
160+
* `test`_
88161
* `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`_
162+
163+
* :ref:`enabled <reference-translator-enabled>`
164+
* `fallbacks`_
165+
* `logging`_
166+
* :ref:`paths <reference-translator-paths>`
167+
168+
* `trusted_hosts`_
169+
* `trusted_proxies`_
96170
* `validation`_
97-
* :ref:`enabled <reference-validation-enabled>`
171+
98172
* :ref:`cache <reference-validation-cache>`
99-
* :ref:`enable_annotations <reference-validation-enable_annotations>`
100-
* `translation_domain`_
101-
* `strict_email`_
102173
* `email_validation_mode`_
174+
* :ref:`enable_annotations <reference-validation-enable_annotations>`
175+
* :ref:`enabled <reference-validation-enabled>`
103176
* :ref:`mapping <reference-validation-mapping>`
177+
104178
* :ref:`paths <reference-validation-mapping-paths>`
105-
* `annotations`_
106-
* :ref:`cache <reference-annotations-cache>`
107-
* `file_cache_dir`_
108-
* `debug`_
109-
* `serializer`_
110-
* :ref:`enabled <reference-serializer-enabled>`
111-
* :ref:`enable_annotations <reference-serializer-enable_annotations>`
112-
* :ref:`name_converter <reference-serializer-name_converter>`
113-
* :ref:`circular_reference_handler <reference-serializer-circular_reference_handler>`
114-
* :ref:`mapping <reference-serializer-mapping>`
115-
* :ref:`paths <reference-serializer-mapping-paths>`
116-
* `php_errors`_
117-
* `log`_
118-
* `throw`_
119-
* :ref:`cache <reference-cache>`
120-
* :ref:`app <reference-cache-app>`
121-
* `system`_
122-
* `directory`_
123-
* `default_doctrine_provider`_
124-
* `default_psr6_provider`_
125-
* `default_redis_provider`_
126-
* `default_memcached_provider`_
127-
* `pools`_
128-
* :ref:`name <reference-cache-pools-name>`
129-
* `adapter`_
130-
* `public`_
131-
* `tags`_
132-
* `default_lifetime`_
133-
* `provider`_
134-
* `clearer`_
135-
* `prefix_seed`_
136-
* :ref:`lock <reference-lock>`
179+
180+
* `strict_email`_
181+
* `translation_domain`_
137182

138183
secret
139184
~~~~~~

‎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 10000 -
* `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