Skip to content

Commit c6e50b7

Browse files
committed
Removing several "2.1" references, which is consistent with our release process:
"Remove all versionadded directives - and any other notes related to features changing or being new - for the version (e.g. 2.1) from the master branch. The result is that the next release (which is the first that comes entirely after the end of maintenance of this branch), will have no mentions of the old version (e.g. 2.1)." This should have been done when 2.1 reached end of maintenance, but the release process wasn't formed at that time. Also, the release of 2.3 and the end of maintenance for 2.1 were unique because they basically happened at the same time. For our purposes, we assume that 2.3 was released before the 2.1 end of life, which means that the 2.1 references are removed for 2.4 (master), not for 2.3.
1 parent 5471a32 commit c6e50b7

File tree

9 files changed

+6
-43
lines changed

9 files changed

+6
-43
lines changed

book/forms.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1792,11 +1792,6 @@ The answer is to setup the constraints yourself, and attach them to the individu
17921792
fields. The overall approach is covered a bit more in the :ref:`validation chapter<book-validation-raw-values>`,
17931793
but here's a short example:
17941794

1795-
.. versionadded:: 2.1
1796-
The ``constraints`` option, which accepts a single constraint or an array
1797-
of constraints (before 2.1, the option was called ``validation_constraint``,
1798-
and only accepted a single constraint) is new to Symfony 2.1.
1799-
18001795
.. code-block:: php
18011796
18021797
use Symfony\Component\Validator\Constraints\Length;

book/security.rst

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -418,12 +418,8 @@ submission (i.e. ``/login_check``):
418418

419419
You will *not* need to implement a controller for the ``/login_check``
420420
URL as the firewall will automatically catch and process any form submitted
421-
to this URL.
422-
423-
.. versionadded:: 2.1
424-
As of Symfony 2.1, you *must* have routes configured for your ``login_path``,
425-
``check_path`` ``logout`` keys. These keys can be route names (as shown
426-
in this example) or URLs that have routes configured for them.
421+
to this URL. However, you *must* have a route (as shown here) for this
422+
URL, as well as one for your logout path (see :ref:`book-security-logging-out`).
427423

428424
Notice that the name of the ``login`` route matches the ``login_path`` config
429425
value, as that's where the security system will redirect users that need
@@ -1700,6 +1696,8 @@ In the above configuration, users with ``ROLE_ADMIN`` role will also have the
17001696
``ROLE_USER`` role. The ``ROLE_SUPER_ADMIN`` role has ``ROLE_ADMIN``, ``ROLE_ALLOWED_TO_SWITCH``
17011697
and ``ROLE_USER`` (inherited from ``ROLE_ADMIN``).
17021698

1699+
.. _book-security-logging-out:
1700+
17031701
Logging Out
17041702
-----------
17051703

book/translation.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -557,11 +557,6 @@ by defining a ``default_locale`` for the framework:
557557
'default_locale' => 'en',
558558
));
559559
560-
.. versionadded:: 2.1
561-
The ``default_locale`` parameter was defined under the session key
562-
originally, however, as of 2.1 this has been moved. This is because the
563-
locale is now set on the request instead of the session.
564-
565560
.. _book-translation-locale-url:
566561

567562
The Locale and the URL

components/config/definition.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ node definition. Node type are available for:
100100
* scalar
101101
* boolean
102102
* integer (new in 2.2)
103-
* float (new in 2.2)
104-
* enum (new in 2.1)
103+
* float
104+
* enum
105105
* array
106106
* variable (no validation)
107107

@@ -136,9 +136,6 @@ allowing to validate the value::
136136
Enum nodes
137137
~~~~~~~~~~
138138

139-
.. versionadded:: 2.1
140-
The enum node is new in Symfony 2.1
141-
142139
Enum nodes provide a constraint to match the given input against a set of
143140
values::
144141

components/event_dispatcher/immutable_dispatcher.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
The Immutable Event Dispatcher
55
==============================
66

7-
.. versionadded:: 2.1
8-
This feature was added in Symfony 2.1.
9-
107
The :class:`Symfony\\Component\\EventDispatcher\\ImmutableEventDispatcher` is
118
a locked or frozen event dispatcher. The dispatcher cannot register new
129
listeners or subscribers.

components/process.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@ anonymous function to the
6464
}
6565
});
6666

67-
.. versionadded:: 2.1
68-
The non-blocking feature was added in 2.1.
69-
7067
Running Processes Asynchronously
7168
--------------------------------
7269

cookbook/configuration/pdo_session_storage.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ Symfony2 has a built-in solution for database session storage called
1414
To use it, you just need to change some parameters in ``config.yml`` (or the
1515
configuration format of your choice):
1616

17-
.. versionadded:: 2.1
18-
In Symfony2.1 the class and namespace are slightly modified. You can now
19-
find the session storage classes in the `Session\\Storage` namespace:
20-
``Symfony\Component\HttpFoundation\Session\Storage``. Also
21-
note that in Symfony2.1 you should configure ``handler_id`` not ``storage_id`` like in Symfony2.0.
22-
Below, you'll notice that ``%session.storage.options%`` is not used anymore.
23-
2417
.. configuration-block::
2518

2619
.. code-block:: yaml

reference/constraints/Regex.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,6 @@ string *does* match this pattern.
177177
htmlPattern
178178
~~~~~~~~~~~
179179

180-
.. versionadded:: 2.1
181-
The ``htmlPattern`` option was added in Symfony 2.1
182-
183180
**type**: ``string|Boolean`` **default**: null
184181

185182
This option specifies the pattern to use in the HTML5 ``pattern`` attribute.

reference/dic_tags.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -964,9 +964,6 @@ translation.extractor
964964
965965
**Purpose**: To register a custom service that extracts messages from a file
966966
967-
.. versionadded:: 2.1
968-
The ability to add message extractors is new in Symfony 2.1.
969-
970967
When executing the ``translation:update`` command, it uses extractors to
971968
extract translation messages from a file. By default, the Symfony2 framework
972969
has a :class:`Symfony\\Bridge\\Twig\\Translation\\TwigExtractor` and a
@@ -1035,9 +1032,6 @@ translation.dumper
10351032
10361033
**Purpose**: To register a custom service that dumps messages to a file
10371034
1038-
.. versionadded:: 2.1
1039-
The ability to add message dumpers is new in Symfony 2.1.
1040-
10411035
After an `Extractor <translation.extractor>`_ has extracted all messages from
10421036
the templates, the dumpers are executed to dump the messages to a translation
10431037
file in a specific format.

0 commit comments

Comments
 (0)