Skip to content

Navigation Menu

Sign in

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 a6a8c37

Browse filesBrowse files
weaverryanweaverryan
committed
Merge branch '4.0'
* 4.0: Long line wrapping [Form] Removed Integer scale option Fixed the paths of the Monolog config files Minor fixes Update swiftmailer.rst Added the missing Installation seciton in LDAP article
2 parents 31c56d9 + 80fd0a6 commit a6a8c37
Copy full SHA for a6a8c37

File tree

8 files changed

+62
-25
lines changed
Filter options

8 files changed

+62
-25
lines changed

‎logging.rst

Copy file name to clipboardExpand all lines: logging.rst
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ to write logs using the :phpfunction:`syslog` function:
7474

7575
.. code-block:: yaml
7676
77-
# config/packages/monolog.yaml
77+
# config/packages/prod/monolog.yaml
7878
monolog:
7979
handlers:
8080
# this "file_log" key could be anything
@@ -92,7 +92,7 @@ to write logs using the :phpfunction:`syslog` function:
9292
9393
.. code-block:: xml
9494
95-
<!-- config/packages/monolog.xml -->
95+
<!-- config/packages/prod/monolog.xml -->
9696
<?xml version="1.0" encoding="UTF-8" ?>
9797
<container xmlns="http://symfony.com/schema/dic/services"
9898
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -119,7 +119,7 @@ to write logs using the :phpfunction:`syslog` function:
119119
120120
.. code-block:: php
121121
122-
// config/packages/monolog.php
122+
// config/packages/prod/monolog.php
123123
$container->loadFromExtension('monolog', array(
124124
'handlers' => array(
125125
'file_log' => array(
@@ -150,7 +150,7 @@ one of the messages reaches an ``action_level``. Take this example:
150150

151151
.. code-block:: yaml
152152
153-
# config/packages/monolog.yaml
153+
# config/packages/prod/monolog.yaml
154154
monolog:
155155
handlers:
156156
filter_for_errors:
@@ -171,7 +171,7 @@ one of the messages reaches an ``action_level``. Take this example:
171171
172172
.. code-block:: xml
173173
174-
<!-- config/packages/monolog.xml -->
174+
<!-- config/packages/prod/monolog.xml -->
175175
<?xml version="1.0" encoding="UTF-8" ?>
176176
<container xmlns="http://symfony.com/schema/dic/services"
177177
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -204,7 +204,7 @@ one of the messages reaches an ``action_level``. Take this example:
204204
205205
.. code-block:: php
206206
207-
// config/packages/monolog.php
207+
// config/packages/prod/monolog.php
208208
$container->loadFromExtension('monolog', array(
209209
'handlers' => array(
210210
'filter_for_errors' => array(
@@ -264,7 +264,7 @@ option of your handler to ``rotating_file``:
264264

265265
.. code-block:: yaml
266266
267-
# config/packages/dev/monolog.yaml
267+
# config/packages/prod/monolog.yaml
268268
monolog:
269269
handlers:
270270
main:
@@ -277,7 +277,7 @@ option of your handler to ``rotating_file``:
277277
278278
.. code-block:: xml
279279
280-
<!-- config/packages/dev/monolog.xml -->
280+
<!-- config/packages/prod/monolog.xml -->
281281
<?xml version="1.0" encoding="UTF-8" ?>
282282
<container xmlns="http://symfony.com/schema/dic/services"
283283
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -301,7 +301,7 @@ option of your handler to ``rotating_file``:
301301
302302
.. code-block:: php
303303
304-
// config/packages/dev/monolog.php
304+
// config/packages/prod/monolog.php
305305
$container->loadFromExtension('monolog', array(
306306
'handlers' => array(
307307
'main' => array(

‎logging/channels_handlers.rst

Copy file name to clipboardExpand all lines: logging/channels_handlers.rst
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ from the ``security`` channel:
3131

3232
.. code-block:: yaml
3333
34-
# config/packages/monolog.yaml
34+
# config/packages/prod/monolog.yaml
3535
monolog:
3636
handlers:
3737
security:
@@ -48,7 +48,7 @@ from the ``security`` channel:
4848
4949
.. code-block:: xml
5050
51-
<!-- config/packages/monolog.xml-->
51+
<!-- config/packages/prod/monolog.xml-->
5252
<container xmlns="http://symfony.com/schema/dic/services"
5353
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5454
xmlns:monolog="http://symfony.com/schema/dic/monolog"
@@ -75,7 +75,7 @@ from the ``security`` channel:
7575
7676
.. code-block:: php
7777
78-
// config/packages/monolog.php
78+
// config/packages/prod/monolog.php
7979
$container->loadFromExtension('monolog', array(
8080
'handlers' => array(
8181
'security' => array(
@@ -137,13 +137,13 @@ You can also configure additional channels without the need to tag your services
137137

138138
.. code-block:: yaml
139139
140-
# config/packages/monolog.yaml
140+
# config/packages/prod/monolog.yaml
141141
monolog:
142142
channels: ['foo', 'bar']
143143
144144
.. code-block:: xml
145145
146-
<!-- config/packages/monolog.xml -->
146+
<!-- config/packages/prod/monolog.xml -->
147147
<container xmlns="http://symfony.com/schema/dic/services"
148148
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
149149
xmlns:monolog="http://symfony.com/schema/dic/monolog"
@@ -160,7 +160,7 @@ You can also configure additional channels without the need to tag your services
160160
161161
.. code-block:: php
162162
163-
// config/packages/monolog.php
163+
// config/packages/prod/monolog.php
164164
$container->loadFromExtension('monolog', array(
165165
'channels' => array(
166166
'foo',

‎logging/processors.rst

Copy file name to clipboardExpand all lines: logging/processors.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Finally, set the formatter to be used on whatever handler you want:
109109

110110
.. code-block:: yaml
111111
112-
# config/packages/monolog.yaml
112+
# config/packages/prod/monolog.yaml
113113
monolog:
114114
handlers:
115115
main:
@@ -120,7 +120,7 @@ Finally, set the formatter to be used on whatever handler you want:
120120
121121
.. code-block:: xml
122122
123-
<!-- config/packages/monolog.xml -->
123+
<!-- config/packages/prod/monolog.xml -->
124124
<?xml version="1.0" encoding="UTF-8" ?>
125125
<container xmlns="http://symfony.com/schema/dic/services"
126126
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -143,7 +143,7 @@ Finally, set the formatter to be used on whatever handler you want:
143143
144144
.. code-block:: php
145145
146-
// config/packages/monolog.php
146+
// config/packages/prod/monolog.php
147147
$container->loadFromExtension('monolog', array(
148148
'handlers' => array(
149149
'main' => array(

‎reference/configuration/monolog.rst

Copy file name to clipboardExpand all lines: reference/configuration/monolog.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Full Default Configuration
1414

1515
.. code-block:: yaml
1616
17-
# config/packages/monolog.yaml
17+
# config/packages/prod/monolog.yaml
1818
monolog:
1919
handlers:
2020
@@ -80,7 +80,7 @@ Full Default Configuration
8080
8181
.. code-block:: xml
8282
83-
<!-- config/packages/monolog.xml -->
83+
<!-- config/packages/prod/monolog.xml -->
8484
<container xmlns="http://symfony.com/schema/dic/services"
8585
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
8686
xmlns:monolog="http://symfony.com/schema/dic/monolog"

‎reference/configuration/swiftmailer.rst

Copy file name to clipboardExpand all lines: reference/configuration/swiftmailer.rst
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Configuration
2222
* `transport`_
2323
* `username`_
2424
* `password`_
25+
* `command`_
2526
* `host`_
2627
* `port`_
2728
* `timeout`_
@@ -77,6 +78,13 @@ password
7778

7879
The password when using ``smtp`` as the transport.
7980

81+
command
82+
~~~~~~~~
83+
84+
**type**: ``string`` **default**: ``/usr/sbin/sendmail -bs``
85+
86+
Command to be executed by ``sendmail`` transport.
87+
8088
host
8189
~~~~
8290

‎reference/forms/types/integer.rst

Copy file name to clipboardExpand all lines: reference/forms/types/integer.rst
+11-4Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ integers. By default, all non-integer values (e.g. 6.78) will round down
1717
| Rendered as | ``input`` ``number`` field |
1818
+-------------+-----------------------------------------------------------------------+
1919
| Options | - `grouping`_ |
20-
| | - `scale`_ |
2120
| | - `rounding_mode`_ |
2221
+-------------+-----------------------------------------------------------------------+
2322
| Overridden | - `compound`_ |
24-
| options | |
23+
| options | - `scale`_ |
2524
+-------------+-----------------------------------------------------------------------+
2625
| Inherited | - `data`_ |
2726
| options | - `disabled`_ |
@@ -46,8 +45,6 @@ Field Options
4645

4746
.. include:: /reference/forms/types/options/grouping.rst.inc
4847

49-
.. include:: /reference/forms/types/options/scale.rst.inc
50-
5148
rounding_mode
5249
~~~~~~~~~~~~~
5350

@@ -82,6 +79,16 @@ Overridden Options
8279

8380
.. include:: /reference/forms/types/options/compound_type.rst.inc
8481

82+
scale
83+
~~~~~
84+
85+
**type**: ``integer`` **default**: ``0``
86+
87+
This specifies how many decimals will be allowed until the field rounds the
88+
submitted value (via ``rounding_mode``). This option inherits from
89+
:doc:`number </reference/forms/types/number>` type and is overriden to ``0`` for
90+
``IntegerType``.
91+
8592
Inherited Options
8693
-----------------
8794

‎reference/forms/types/number.rst

Copy file name to clipboardExpand all lines: reference/forms/types/number.rst
+13-1Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,19 @@ Field Options
4141

4242
.. include:: /reference/forms/types/options/grouping.rst.inc
4343

44-
.. include:: /reference/forms/types/options/scale.rst.inc
44+
scale
45+
~~~~~
46+
47+
.. versionadded:: 2.7
48+
The ``scale`` option was introduced in Symfony 2.7. Prior to Symfony 2.7,
49+
it was known as ``precision``.
50+
51+
**type**: ``integer`` **default**: Locale-specific (usually around ``3``)
52+
53+
This specifies how many decimals will be allowed until the field rounds
54+
the submitted value (via ``rounding_mode``). For example, if ``scale`` is set
55+
to ``2``, a submitted value of ``20.123`` will be rounded to, for example,
56+
``20.12`` (depending on your `rounding_mode`_).
4557

4658
.. include:: /reference/forms/types/options/rounding_mode.rst.inc
4759

‎security/ldap.rst

Copy file name to clipboardExpand all lines: security/ldap.rst
+10Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,16 @@ This means that the following scenarios will work:
3434
* Loading user information from an LDAP server, while using another
3535
authentication strategy (token-based pre-authentication, for example).
3636

37+
Installation
38+
------------
39+
40+
In applications using :doc:`Symfony Flex </setup/flex>`, run this command to
41+
install the Ldap component before using it:
42+
43+
.. code-block:: terminal
44+
45+
$ composer require ldap
46+
3747
Ldap Configuration Reference
3848
----------------------------
3949

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.