Skip to content

Commit f05a8c3

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: Remove reference to 2.x, 3.x, 4.x versions
2 parents 4fa60ea + 4ae7e97 commit f05a8c3

File tree

7 files changed

+7
-43
lines changed

7 files changed

+7
-43
lines changed

components/browser_kit.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@ The BrowserKit Component
88
The BrowserKit component simulates the behavior of a web browser, allowing
99
you to make requests, click on links and submit forms programmatically.
1010

11-
.. note::
12-
13-
In Symfony versions prior to 4.3, the BrowserKit component could only make
14-
internal requests to your application. Starting from Symfony 4.3, this
15-
component can also :ref:`make HTTP requests to any public site <component-browserkit-external-requests>`
16-
when using it in combination with the :doc:`HttpClient component </http_client>`.
17-
1811
Installation
1912
------------
2013

components/config/definition.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ the following ways:
780780
- ``ifTrue()``
781781
- ``ifString()``
782782
- ``ifNull()``
783-
- ``ifEmpty()`` (since Symfony 3.2)
783+
- ``ifEmpty()``
784784
- ``ifArray()``
785785
- ``ifInArray()``
786786
- ``ifNotInArray()``

components/event_dispatcher/container_aware_dispatcher.rst

Lines changed: 0 additions & 10 deletions
This file was deleted.

components/filesystem/lock_handler.rst

Lines changed: 0 additions & 7 deletions
This file was deleted.

contributing/code/bc.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ that release branch (5.x in the previous example).
1212
We also provide deprecation message triggered in the code base to help you with
1313
the migration process across major releases.
1414

15-
.. caution::
16-
17-
This promise was introduced with Symfony 2.3 and does not apply to previous
18-
versions of Symfony.
19-
2015
However, backward compatibility comes in many different flavors. In fact, almost
2116
every change that we make to the framework can potentially break an application.
2217
For example, if we add a new method to a class, this will break an application

profiler.rst

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,12 @@ need to create a custom data collector. Instead, use the built-in utilities to
110110
Consider using a professional profiler such as `Blackfire`_ to measure and
111111
analyze the execution of your application in detail.
112112

113-
Enabling the Profiler Conditionally
114-
-----------------------------------
113+
.. _enabling-the-profiler-conditionally:
115114

116-
.. caution::
117-
118-
The possibility to use a matcher to enable the profiler conditionally was
119-
removed in Symfony 4.0.
115+
Enabling the Profiler Programmatically
116+
--------------------------------------
120117

121-
Symfony Profiler cannot be enabled/disabled conditionally using matchers, because
122-
that feature was removed in Symfony 4.0. However, you can use the ``enable()``
118+
Symfony Profiler can be enabled and disabled programmatically. You can use the ``enable()``
123119
and ``disable()`` methods of the :class:`Symfony\\Component\\HttpKernel\\Profiler\\Profiler`
124120
class in your controllers to manage the profiler programmatically::
125121

service_container.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,11 +1074,8 @@ unique string as the key of each service config:
10741074
Explicitly Configuring Services and Arguments
10751075
---------------------------------------------
10761076

1077-
Prior to Symfony 3.3, all services and (typically) arguments were explicitly configured:
1078-
it was not possible to :ref:`load services automatically <service-container-services-load-example>`
1079-
and :ref:`autowiring <services-autowire>` was much less common.
1080-
1081-
Both of these features are optional. And even if you use them, there may be some
1077+
:ref:`Loading services automatically <service-container-services-load-example>`
1078+
and :ref:`autowiring <services-autowire>` are optional. And even if you use them, there may be some
10821079
cases where you want to manually wire a service. For example, suppose that you want
10831080
to register *2* services for the ``SiteUpdateManager`` class - each with a different
10841081
admin email. In this case, each needs to have a unique service id:

0 commit comments

Comments
 (0)