Skip to content

Commit eb11780

Browse files
weaverryanweaverryan
committed
Merge branch 'versionadded_23' of github.com:WouterJ/symfony-docs into WouterJ-versionadded_23
Conflicts: components/process.rst reference/constraints/Collection.rst
2 parents d0b29cc + 4346f75 commit eb11780

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+5
-240
lines changed

‎book/forms.rst

Lines changed: 4 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,6 @@ it into a format that's suitable for being rendered in an HTML form.
191191
(e.g. ``isPublished()`` or ``hasReminder()``) instead of a getter (e.g.
192192
``getPublished()`` or ``getReminder()``).
193193

194-
.. versionadded:: 2.1
195-
Support for "hasser" methods was added in Symfony 2.1.
196-
197194
.. index::
198195
single: Forms; Handling form submissions
199196

@@ -487,10 +484,6 @@ controller.
487484
Groups based on the Submitted Data
488485
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
489486

490-
.. versionadded:: 2.1
491-
The ability to specify a callback or Closure in ``validation_groups``
492-
is new to version 2.1
493-
494487
If you need some advanced logic to determine the validation groups (e.g.
495488
based on submitted data), you can set the ``validation_groups`` option
496489
to an array callback::
@@ -1352,18 +1345,13 @@ To customize any portion of a form, you just need to override the appropriate
13521345
fragment. Knowing exactly which block or file to override is the subject of
13531346
the next section.
13541347

1355-
.. versionadded:: 2.1
1356-
An alternate Twig syntax for ``form_theme`` has been introduced in 2.1. It accepts
1357-
any valid Twig expression (the most noticeable difference is using an array when
1358-
using multiple themes).
1359-
1360-
.. code-block:: html+jinja
1348+
.. code-block:: html+jinja
13611349

1362-
{# src/Acme/TaskBundle/Resources/views/Default/new.html.twig #}
1350+
{# src/Acme/TaskBundle/Resources/views/Default/new.html.twig #}
13631351

1364-
{% form_theme form with 'AcmeTaskBundle:Form:fields.html.twig' %}
1352+
{% form_theme form with 'AcmeTaskBundle:Form:fields.html.twig' %}
13651353

1366-
{% form_theme form with ['AcmeTaskBundle:Form:fields.html.twig', 'AcmeTaskBundle:Form:fields2.html.twig'] %}
1354+
{% form_theme form with ['AcmeTaskBundle:Form:fields.html.twig', 'AcmeTaskBundle:Form:fields2.html.twig'] %}
13671355

13681356
For a more extensive discussion, see :doc:`/cookbook/form/form_customization`.
13691357

@@ -1721,11 +1709,6 @@ The answer is to setup the constraints yourself, and attach them to the individu
17211709
fields. The overall approach is covered a bit more in the :ref:`validation chapter<book-validation-raw-values>`,
17221710
but here's a short example:
17231711

1724-
.. versionadded:: 2.1
1725-
The ``constraints`` option, which accepts a single constraint or an array
1726-
of constraints (before 2.1, the option was called ``validation_constraint``,
1727-
and only accepted a single constraint) is new to Symfony 2.1.
1728-
17291712
.. code-block:: php
17301713
17311714
use Symfony\Component\Validator\Constraints\Length;

‎book/page_creation.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -812,9 +812,6 @@ options of each feature.
812812
Default Configuration Dump
813813
~~~~~~~~~~~~~~~~~~~~~~~~~~
814814

815-
.. versionadded:: 2.1
816-
The ``config:dump-reference`` command was added in Symfony 2.1
817-
818815
You can dump the default configuration for a bundle in yaml to the console using
819816
the ``config:dump-reference`` command. Here is an example of dumping the default
820817
FrameworkBundle configuration:

‎book/security.rst

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -410,11 +410,6 @@ submission (i.e. ``/login_check``):
410410
URL as the firewall will automatically catch and process any form submitted
411411
to this URL.
412412

413-
.. versionadded:: 2.1
414-
As of Symfony 2.1, you *must* have routes configured for your ``login_path``,
415-
``check_path`` ``logout`` keys. These keys can be route names (as shown
416-
in this example) or URLs that have routes configured for them.
417-
418413
Notice that the name of the ``login`` route matches the``login_path`` config
419414
value, as that's where the security system will redirect users that need
420415
to login.
@@ -1167,12 +1162,6 @@ custom user class is that it implements the :class:`Symfony\\Component\\Security
11671162
interface. This means that your concept of a "user" can be anything, as long
11681163
as it implements this interface.
11691164

1170-
.. versionadded:: 2.1
1171-
In Symfony 2.1, the ``equals`` method was removed from ``UserInterface``.
1172-
If you need to override the default implementation of comparison logic,
1173-
implement the new :class:`Symfony\\Component\\Security\\Core\\User\\EquatableInterface`
1174-
interface.
1175-
11761165
.. note::
11771166

11781167
The user object will be serialized and saved in the session during requests,

‎book/service_container.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,6 @@ The end result is exactly the same as before - the difference is only in
227227
to look for parameters with those names. When the container is built, it
228228
looks up the value of each parameter and uses it in the service definition.
229229

230-
.. versionadded:: 2.1
231-
Escaping the ``@`` character in YAML parameter values is new in Symfony 2.1.9
232-
and Symfony 2.2.1.
233-
234230
.. note::
235231

236232
If you want to use a string that starts with an ``@`` sign as a parameter

‎book/templating.rst

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -665,9 +665,6 @@ Controllers are fast to execute and promote good code organization and reuse.
665665
Asynchronous Content with hinclude.js
666666
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
667667

668-
.. versionadded:: 2.1
669-
hinclude.js support was added in Symfony 2.1
670-
671668
Controllers can be embedded asynchronously using the hinclude.js_ javascript library.
672669
As the embedded content comes from another page (or controller for that matter),
673670
Symfony2 uses the standard ``render`` helper to configure ``hinclude`` tags:
@@ -1443,9 +1440,6 @@ is ``true``. By default this means that the variables will be dumped in the
14431440
Syntax Checking
14441441
---------------
14451442

1446-
.. versionadded:: 2.1
1447-
The ``twig:lint`` command was added in Symfony 2.1
1448-
14491443
You can check for syntax errors in Twig templates using the ``twig:lint``
14501444
console command:
14511445

‎book/translation.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -554,11 +554,6 @@ by defining a ``default_locale`` for the framework:
554554
'default_locale' => 'en',
555555
));
556556
557-
.. versionadded:: 2.1
558-
The ``default_locale`` parameter was defined under the session key
559-
originally, however, as of 2.1 this has been moved. This is because the
560-
locale is now set on the request instead of the session.
561-
562557
.. _book-translation-locale-url:
563558

564559
The Locale and the URL
@@ -825,9 +820,6 @@ texts* and complex expressions:
825820
Note that this only influences the current template, not any "included"
826821
templates (in order to avoid side effects).
827822

828-
.. versionadded:: 2.1
829-
The ``trans_default_domain`` tag is new in Symfony2.1
830-
831823
PHP Templates
832824
~~~~~~~~~~~~~
833825

‎components/class_loader.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ You can install the component in many different ways:
3333
Usage
3434
-----
3535

36-
.. versionadded:: 2.1
37-
The ``useIncludePath`` method was added in Symfony 2.1.
38-
3936
Registering the :class:`Symfony\\Component\\ClassLoader\\UniversalClassLoader`
4037
autoloader is straightforward::
4138

‎components/event_dispatcher/container_aware_dispatcher.rst

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

7-
.. versionadded:: 2.1
8-
This feature was moved into the EventDispatcher component in Symfony 2.1.
9-
107
Introduction
118
------------
129

‎components/event_dispatcher/generic_event.rst

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

7-
.. versionadded:: 2.1
8-
The ``GenericEvent`` event class was added in Symfony 2.1
9-
107
The base :class:`Symfony\\Component\\EventDispatcher\\Event` class provided by the
118
``Event Dispatcher`` component is deliberately sparse to allow the creation of
129
API specific event objects by inheritance using OOP. This allow for elegant and

‎components/event_dispatcher/introduction.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -440,9 +440,6 @@ which returns a boolean value::
440440
EventDispatcher aware Events and Listeners
441441
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
442442

443-
.. versionadded:: 2.1
444-
The ``Event`` object contains a reference to the invoking dispatcher since Symfony 2.1
445-
446443
The ``EventDispatcher`` always injects a reference to itself in the passed event
447444
object. This means that all listeners have direct access to the
448445
``EventDispatcher`` object that notified the listener via the passed ``Event``
@@ -535,9 +532,6 @@ can be the way to go, especially for optional dependencies.
535532
Dispatcher Shortcuts
536533
~~~~~~~~~~~~~~~~~~~~
537534

538-
.. versionadded:: 2.1
539-
``EventDispatcher::dispatch()`` method returns the event since Symfony 2.1.
540-
541535
The :method:`EventDispatcher::dispatch<Symfony\\Component\\EventDispatcher\\EventDispatcher::dispatch>`
542536
method always returns an :class:`Symfony\\Component\\EventDispatcher\\Event`
543537
object. This allows for various shortcuts. For example if one does not need
@@ -575,9 +569,6 @@ and so on...
575569
Event Name Introspection
576570
~~~~~~~~~~~~~~~~~~~~~~~~
577571

578-
.. versionadded:: 2.1
579-
Added event name to the ``Event`` object since Symfony 2.1
580-
581572
Since the ``EventDispatcher`` already knows the name of the event when dispatching
582573
it, the event name is also injected into the
583574
:class:`Symfony\\Component\\EventDispatcher\\Event` objects, making it available

‎components/filesystem.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ The Filesystem Component
66

77
The Filesystem components provides basic utilities for the filesystem.
88

9-
.. versionadded:: 2.1
10-
The Filesystem Component is new to Symfony 2.1. Previously, the ``Filesystem``
11-
class was located in the ``HttpKernel`` component.
12-
139
Installation
1410
------------
1511

‎components/finder.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@ The ``notName()`` method excludes files matching a pattern::
182182
File Contents
183183
~~~~~~~~~~~~~
184184

185-
.. versionadded:: 2.1
186-
The ``contains()`` and ``notContains()`` methods were added in version 2.1
187-
188185
Restrict files by contents with the
189186
:method:`Symfony\\Component\\Finder\\Finder::contains` method::
190187

@@ -243,9 +240,6 @@ Restrict by a size range by chaining calls::
243240
The comparison operator can be any of the following: ``>``, ``>=``, ``<``, ``<=``,
244241
``==``, ``!=``.
245242

246-
.. versionadded:: 2.1
247-
The operator ``!=`` was added in version 2.1.
248-
249243
The target value may use magnitudes of kilobytes (``k``, ``ki``), megabytes
250244
(``m``, ``mi``), or gigabytes (``g``, ``gi``). Those suffixed with an ``i`` use
251245
the appropriate ``2**n`` version in accordance with the `IEC standard`_.
@@ -296,9 +290,6 @@ instance. The file is excluded from the result set if the Closure returns
296290
Reading contents of returned files
297291
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
298292

299-
.. versionadded:: 2.1
300-
Method ``getContents()`` have been introduced in version 2.1.
301-
302293
The contents of returned files can be read with
303294
:method:`Symfony\\Component\\Finder\\SplFileInfo::getContents`::
304295

‎components/http_foundation/introduction.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -387,9 +387,6 @@ To redirect the client to another URL, you can use the
387387
Streaming a Response
388388
~~~~~~~~~~~~~~~~~~~~
389389

390-
.. versionadded:: 2.1
391-
Support for streamed responses was added in Symfony 2.1.
392-
393390
The :class:`Symfony\\Component\\HttpFoundation\\StreamedResponse` class allows
394391
you to stream the Response back to the client. The response content is
395392
represented by a PHP callable instead of a string::
@@ -421,9 +418,6 @@ represented by a PHP callable instead of a string::
421418
Serving Files
422419
~~~~~~~~~~~~~
423420

424-
.. versionadded:: 2.1
425-
The ``makeDisposition`` method was added in Symfony 2.1.
426-
427421
When sending a file, you must add a ``Content-Disposition`` header to your
428422
response. While creating this header for basic file downloads is easy, using
429423
non-ASCII filenames is more involving. The
@@ -480,10 +474,6 @@ right content and headers. A JSON response might look like this::
480474
)));
481475
$response->headers->set('Content-Type', 'application/json');
482476

483-
.. versionadded:: 2.1
484-
The :class:`Symfony\\Component\\HttpFoundation\\JsonResponse`
485-
class was added in Symfony 2.1.
486-
487477
There is also a helpful :class:`Symfony\\Component\\HttpFoundation\\JsonResponse`
488478
class, which can make this even easier::
489479

‎components/http_foundation/sessions.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ The Symfony2 HttpFoundation Component has a very powerful and flexible session
99
subsystem which is designed to provide session management through a simple
1010
object-oriented interface using a variety of session storage drivers.
1111

12-
.. versionadded:: 2.1
13-
The :class:`Symfony\\Component\\HttpFoundation\\Session\\SessionInterface` interface,
14-
as well as a number of other changes, are new as of Symfony 2.1.
15-
1612
Sessions are used via the simple :class:`Symfony\\Component\\HttpFoundation\\Session\\Session`
1713
implementation of :class:`Symfony\\Component\\HttpFoundation\\Session\\SessionInterface` interface.
1814

‎components/http_kernel/introduction.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -451,9 +451,6 @@ method, which sends the headers and prints the ``Response`` content.
451451
8) The ``kernel.terminate`` event
452452
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
453453

454-
.. versionadded:: 2.1
455-
The ``kernel.terminate`` event is new to Symfony 2.1.
456-
457454
**Typical Purposes**: To perform some "heavy" action after the response has
458455
been streamed to the user
459456

‎components/process.rst

Lines changed: 0 additions & 6 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

@@ -142,9 +139,6 @@ instead::
142139
);
143140
$process->run();
144141

145-
.. versionadded:: 2.1
146-
The ``ProcessBuilder`` class was added in Symfony 2.1.
147-
148142
To make your code work better on all platforms, you might want to use the
149143
:class:`Symfony\\Component\\Process\\ProcessBuilder` class instead::
150144

‎cookbook/bundles/extension.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -510,9 +510,6 @@ For more details, see :doc:`/cookbook/bundles/prepend_extension`.
510510
Default Configuration Dump
511511
~~~~~~~~~~~~~~~~~~~~~~~~~~
512512

513-
.. versionadded:: 2.1
514-
The ``config:dump-reference`` command was added in Symfony 2.1
515-
516513
The ``config:dump-reference`` command allows a bundle's default configuration to
517514
be output to the console in yaml.
518515

‎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

‎cookbook/console/sending_emails.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ and per Command.
2020
Configuring the Request Context globally
2121
----------------------------------------
2222

23-
.. versionadded:: 2.1
24-
The ``host`` and ``scheme`` parameters are available since Symfony 2.1
25-
2623
.. versionadded: 2.2
2724
The ``base_url`` parameter is available since Symfony 2.2
2825

‎cookbook/doctrine/resolve_target_entity.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
How to Define Relationships with Abstract Classes and Interfaces
66
================================================================
77

8-
.. versionadded:: 2.1
9-
The ResolveTargetEntityListener is new to Doctrine 2.2, which was first
10-
packaged with Symfony 2.1.
11-
128
One of the goals of bundles is to create discreet bundles of functionality
139
that do not have many (if any) dependencies, allowing you to use that
1410
functionality in other applications without including unnecessary items.

‎cookbook/form/data_transformers.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,6 @@ its error message can be controlled with the ``invalid_message`` field option.
177177
Model and View Transformers
178178
~~~~~~~~~~~~~~~~~~~~~~~~~~~
179179

180-
.. versionadded:: 2.1
181-
The names and method of the transformers were changed in Symfony 2.1.
182-
``prependNormTransformer`` became ``addModelTransformer`` and ``appendClientTransformer``
183-
became ``addViewTransformer``.
184-
185180
In the above example, the transformer was used as a "model" transformer.
186181
In fact, there are two different type of transformers and three different
187182
types of underlying data.

‎cookbook/form/form_collections.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,6 @@ HTML contains the tag ``text`` input element with a name of ``task[tags][__name_
379379
and id of ``task_tags___name___name``. The ``__name__`` is a little "placeholder",
380380
which you'll replace with a unique, incrementing number (e.g. ``task[tags][3][name]``).
381381

382-
.. versionadded:: 2.1
383-
The placeholder was changed from ``$$name$$`` to ``__name__`` in Symfony 2.1
384-
385382
The actual code needed to make this all work can vary quite a bit, but here's
386383
one example:
387384

‎cookbook/logging/channels_handlers.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
How to log Messages to different Files
55
======================================
66

7-
.. versionadded:: 2.1
8-
The ability to specify channels for a specific handler was added to
9-
the MonologBundle for Symfony 2.1.
10-
117
The Symfony Standard Edition contains a bunch of channels for logging: ``doctrine``,
128
``event``, ``security`` and ``request``. Each channel corresponds to a logger
139
service (``monolog.logger.XXX``) in the container and is injected to the

0 commit comments

Comments
 (0)