Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/3.0' into 3.0
Browse files Browse the repository at this point in the history
* origin/3.0:
  Remove reference to profiler lifetime property that was removed in 3.x
  • Loading branch information
weaverryan committed Sep 18, 2016
2 parents 78ae2a7 + d59b560 commit 49492b7
Showing 1 changed file with 0 additions and 41 deletions.
41 changes: 0 additions & 41 deletions reference/configuration/framework.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ Configuration
* `only_exceptions`_
* `only_master_requests`_
* `dsn`_
* `username`_ (deprecated since 2.8)
* `password`_ (deprecated since 2.8)
* `lifetime`_ (deprecated since 2.8)
* `matcher`_
* `ip`_
* :ref:`path <reference-profiler-matcher-path>`
Expand Down Expand Up @@ -556,41 +553,6 @@ The DSN where to store the profiling information.
See :doc:`/profiler/storage` for more information about the
profiler storage.

username
........

.. caution::

The ``framework.profiler.username`` setting is deprecated since Symfony 2.8
and will be removed in Symfony 3.0.

**type**: ``string`` **default**: ``''``

password
........

.. caution::

The ``framework.profiler.password`` setting is deprecated since Symfony 2.8
and will be removed in Symfony 3.0.

**type**: ``string`` **default**: ``''``

When needed, the password for the profiling storage.

lifetime
........

.. caution::

The ``framework.profiler.lifetime`` setting is deprecated since Symfony 2.8
and will be removed in Symfony 3.0.

**type**: ``integer`` **default**: ``86400``

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

matcher
.......

Expand Down Expand Up @@ -1487,9 +1449,6 @@ Full Default Configuration
only_exceptions: false
only_master_requests: false
dsn: file:%kernel.cache_dir%/profiler
username: ~ # deprecated since 2.8, to be removed in 3.0.
password: ~ # deprecated since 2.8, to be removed in 3.0.
lifetime: 86400 # deprecated since 2.8, to be removed in 3.0.
matcher:
ip: ~
Expand Down

0 comments on commit 49492b7

Please sign in to comment.