Skip to content

Commit 5a9865f

Browse files
committed
[symfony#6908] Add deprecations on some other places as well
1 parent 5aeec90 commit 5a9865f

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

reference/configuration/framework.rst

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Configuration
3131
* :ref:`enabled <reference-form-enabled>`
3232
* `csrf_protection`_
3333
* :ref:`enabled <reference-csrf_protection-enabled>`
34-
* `field_name`_ (deprecated as of 2.4)
34+
* `field_name`_ (deprecated since 2.4)
3535
* `esi`_
3636
* :ref:`enabled <reference-esi-enabled>`
3737
* `fragments`_
@@ -43,9 +43,9 @@ Configuration
4343
* `only_exceptions`_
4444
* `only_master_requests`_
4545
* `dsn`_
46-
* `username`_
47-
* `password`_
48-
* `lifetime`_
46+
* `username`_ (deprecated since 2.8)
47+
* `password`_ (deprecated since 2.8)
48+
* `lifetime`_ (deprecated since 2.8)
4949
* `matcher`_
5050
* `ip`_
5151
* :ref:`path <reference-profiler-matcher-path>`
@@ -433,8 +433,8 @@ field_name
433433

434434
.. caution::
435435

436-
The ``framework.csrf_protection.field_name`` setting is deprecated as
437-
of Symfony 2.4, use ``framework.form.csrf_protection.field_name`` instead.
436+
The ``framework.csrf_protection.field_name`` setting is deprecated since
437+
Symfony 2.4, use ``framework.form.csrf_protection.field_name`` instead.
438438

439439
**type**: ``string`` **default**: ``"_token"``
440440

@@ -589,38 +589,38 @@ The DSN where to store the profiling information.
589589
username
590590
........
591591

592-
**type**: ``string`` **default**: ``''``
593-
594592
.. caution::
595593

596-
The ``framework.profiler.username`` setting is deprecated and will be
597-
removed as of Symfony 3.0.
594+
The ``framework.profiler.username`` setting is deprecated since Symfony 2.8
595+
and will be removed in Symfony 3.0.
596+
597+
**type**: ``string`` **default**: ``''``
598598

599599
password
600600
........
601601

602-
**type**: ``string`` **default**: ``''``
602+
.. caution::
603603

604-
When needed, the password for the profiling storage.
604+
The ``framework.profiler.password`` setting is deprecated since Symfony 2.8
605+
and will be removed in Symfony 3.0.
605606

606-
.. caution::
607+
**type**: ``string`` **default**: ``''``
607608

608-
The ``framework.profiler.password`` setting is deprecated and will be
609-
removed as of Symfony 3.0.
609+
When needed, the password for the profiling storage.
610610

611611
lifetime
612612
........
613613

614+
.. caution::
615+
616+
The ``framework.profiler.lifetime`` setting is deprecated since Symfony 2.8
617+
and will be removed in Symfony 3.0.
618+
614619
**type**: ``integer`` **default**: ``86400``
615620

616621
The lifetime of the profiling storage in seconds. The data will be deleted
617622
when the lifetime is expired.
618623

619-
.. caution::
620-
621-
The ``framework.profiler.lifetime`` setting is deprecated and will be
622-
removed as of Symfony 3.0.
623-
624624
matcher
625625
.......
626626

@@ -1555,9 +1555,9 @@ Full Default Configuration
15551555
only_exceptions: false
15561556
only_master_requests: false
15571557
dsn: file:%kernel.cache_dir%/profiler
1558-
username:
1559-
password:
1560-
lifetime: 86400
1558+
username: ~ # deprecated since 2.8, to be removed in 3.0.
1559+
password: ~ # deprecated since 2.8, to be removed in 3.0.
1560+
lifetime: 86400 # deprecated since 2.8, to be removed in 3.0.
15611561
matcher:
15621562
ip: ~
15631563

0 commit comments

Comments
 (0)