symfony · J7mbo · Oct 18, 2012 · Oct 21, 2012 · Oct 21, 2012 · Oct 29, 2012
diff --git a/book/controller.rst b/book/controller.rst
@@ -325,7 +325,7 @@ working with forms, for example::
     {
         $form = $this->createForm(...);
 
-        $form->bind($request);
+        $form->handleRequest($request);
         // ...
     }
 
@@ -663,7 +663,8 @@ For example, imagine you're processing a form submit::
     {
         $form = $this->createForm(...);
 
-        $form->bind($this->getRequest());
+        $form->handleRequest($this->getRequest());
+
         if ($form->isValid()) {
             // do some sort of processing
 

diff --git a/book/forms.rst b/book/forms.rst
diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
@@ -433,7 +433,7 @@ content:
 
     {
         "require": {
-            "symfony/symfony": "2.2.*"
+            "symfony/symfony": "2.3.*"
         },
         "autoload": {
             "files": ["model.php","controllers.php"]

diff --git a/book/internals.rst b/book/internals.rst
@@ -367,9 +367,6 @@ The ``FrameworkBundle`` registers several listeners:
 ``kernel.terminate`` Event
 ..........................
 
-.. versionadded:: 2.1
-    The ``kernel.terminate`` event is new since Symfony 2.1.
-
 The purpose of this event is to perform "heavier" tasks after the response
 was already served to the client.
 

diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -586,7 +586,6 @@ method of the ``AppKernel`` class::
             new Symfony\Bundle\DoctrineBundle\DoctrineBundle(),
             new Symfony\Bundle\AsseticBundle\AsseticBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
-            new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {
@@ -813,9 +812,6 @@ options of each feature.
 Default Configuration Dump
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.1
-    The ``config:dump-reference`` command was added in Symfony 2.1
-
 You can dump the default configuration for a bundle in yaml to the console using
 the ``config:dump-reference`` command.  Here is an example of dumping the default
 FrameworkBundle configuration:

diff --git a/book/routing.rst b/book/routing.rst
@@ -788,7 +788,7 @@ a slash. URLs matching this route might look like:
 .. note::
 
     Sometimes you want to make certain parts of your routes globally configurable.
-    Symfony2.1 provides you with a way to do this by leveraging service container
+    Symfony provides you with a way to do this by leveraging service container
     parameters. Read more about this in ":doc:`/cookbook/routing/service_container_parameters`.
 
 Special Routing Parameters

diff --git a/book/security.rst b/book/security.rst
@@ -410,11 +410,6 @@ submission (i.e.  ``/login_check``):
     URL as the firewall will automatically catch and process any form submitted
     to this URL.
 
-.. versionadded:: 2.1
-    As of Symfony 2.1, you *must* have routes configured for your ``login_path``,
-    ``check_path`` ``logout`` keys. These keys can be route names (as shown
-    in this example) or URLs that have routes configured for them.
-
 Notice that the name of the ``login`` route matches the``login_path`` config
 value, as that's where the security system will redirect users that need
 to login.
@@ -770,7 +765,7 @@ access control should be used on this request. The following ``access_control``
 options are used for matching:
 
 * ``path``
-* ``ip``
+* ``ip`` or ``ips``
 * ``host``
 * ``methods``
 
@@ -877,6 +872,11 @@ prevent any direct access to these resources from a web browser (by guessing the
 ESI URL pattern), the ESI route **must** be secured to be only visible from
 the trusted reverse proxy cache.
 
+.. versionadded:: 2.3
+    Version 2.3 allows multiple IP addresses in a single rule with the ``ips: [a, b]``
+    construct.  Prior to 2.3, users should create one rule per IP address to match and
+    use the ``ip`` key instead of ``ips``.
+
 Here is an example of how you might secure all ESI routes that start with a
 given prefix, ``/esi``, from outside access:
 
@@ -888,36 +888,37 @@ given prefix, ``/esi``, from outside access:
         security:
             # ...
             access_control:
-                - { path: ^/esi, roles: IS_AUTHENTICATED_ANONYMOUSLY, ip: 127.0.0.1 }
+                - { path: ^/esi, roles: IS_AUTHENTICATED_ANONYMOUSLY, ips: [127.0.0.1, ::1] }
                 - { path: ^/esi, roles: ROLE_NO_ACCESS }
 
     .. code-block:: xml
 
             <access-control>
-                <rule path="^/esi" role="IS_AUTHENTICATED_ANONYMOUSLY" ip="127.0.0.1" />
+                <rule path="^/esi" role="IS_AUTHENTICATED_ANONYMOUSLY" ips="127.0.0.1, ::1" />
                 <rule path="^/esi" role="ROLE_NO_ACCESS" />
             </access-control>
 
     .. code-block:: php
 
             'access_control' => array(
-                array('path' => '^/esi', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY', 'ip' => '127.0.0.1'),
+                array('path' => '^/esi', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY', 'ips' => '127.0.0.1, ::1'),
                 array('path' => '^/esi', 'role' => 'ROLE_NO_ACCESS'),
             ),
 
 Here is how it works when the path is ``/esi/something`` coming from the
 ``10.0.0.1`` IP:
 
 * The first access control rule is ignored as the ``path`` matches but the
-  ``ip`` does not;
+  ``ip`` does not match either of the IPs listed;
 
 * The second access control rule is enabled (the only restriction being the
   ``path`` and it matches): as the user cannot have the ``ROLE_NO_ACCESS``
   role as it's not defined, access is denied (the ``ROLE_NO_ACCESS`` role can
   be anything that does not match an existing role, it just serves as a trick
   to always deny access).
 
-Now, if the same request comes from ``127.0.0.1``:
+Now, if the same request comes from ``127.0.0.1`` or ``::1`` (the IPv6 loopback
+address):
 
 * Now, the first access control rule is enabled as both the ``path`` and the
   ``ip`` match: access is allowed as the user always has the
@@ -1161,12 +1162,6 @@ custom user class is that it implements the :class:`Symfony\\Component\\Security
 interface. This means that your concept of a "user" can be anything, as long
 as it implements this interface.
 
-.. versionadded:: 2.1
-    In Symfony 2.1, the ``equals`` method was removed from ``UserInterface``.
-    If you need to override the default implementation of comparison logic,
-    implement the new :class:`Symfony\\Component\\Security\\Core\\User\\EquatableInterface`
-    interface.
-
 .. note::
 
     The user object will be serialized and saved in the session during requests,

diff --git a/book/service_container.rst b/book/service_container.rst
@@ -227,10 +227,6 @@ The end result is exactly the same as before - the difference is only in
 to look for parameters with those names. When the container is built, it
 looks up the value of each parameter and uses it in the service definition.
 
-.. versionadded:: 2.1
-    Escaping the ``@`` character in YAML parameter values is new in Symfony 2.1.9
-    and Symfony 2.2.1.
-
 .. note::
 
     If you want to use a string that starts with an ``@`` sign as a parameter

diff --git a/book/templating.rst b/book/templating.rst
@@ -665,9 +665,6 @@ Controllers are fast to execute and promote good code organization and reuse.
 Asynchronous Content with hinclude.js
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. versionadded:: 2.1
-    hinclude.js support was added in Symfony 2.1
-
 Controllers can be embedded asynchronously using the hinclude.js_ javascript library.
 As the embedded content comes from another page (or controller for that matter),
 Symfony2 uses the standard ``render`` helper to configure ``hinclude`` tags:
@@ -1409,9 +1406,6 @@ is ``true``. By default this means that the variables will be dumped in the
 Syntax Checking
 ---------------
 
-.. versionadded:: 2.1
-    The ``twig:lint`` command was added in Symfony 2.1
-
 You can check for syntax errors in Twig templates using the ``twig:lint``
 console command:
 

diff --git a/book/testing.rst b/book/testing.rst
@@ -401,6 +401,10 @@ The Client supports many operations that can be done in a real browser::
 Accessing Internal Objects
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+.. versionadded:: 2.3
+    The ``getInternalRequest()`` and ``getInternalResponse()`` method were
+    added in Symfony 2.3.
+
 If you use the client to test your application, you might want to access the
 client's internal objects::
 
@@ -409,8 +413,18 @@ client's internal objects::
 
 You can also get the objects related to the latest request::
 
+    // the HttpKernel request instance
     $request  = $client->getRequest();
+
+    // the BrowserKit request instance
+    $request  = $client->getInternalRequest();
+
+    // the HttpKernel response instance
     $response = $client->getResponse();
+
+    // the BrowserKit response instance
+    $response = $client->getInternalResponse();
+
     $crawler  = $client->getCrawler();
 
 If your requests are not insulated, you can also access the ``Container`` and

diff --git a/book/translation.rst b/book/translation.rst
@@ -554,11 +554,6 @@ by defining a ``default_locale`` for the framework:
             'default_locale' => 'en',
         ));
 
-.. versionadded:: 2.1
-     The ``default_locale`` parameter was defined under the session key
-     originally, however, as of 2.1 this has been moved. This is because the 
-     locale is now set on the request instead of the session.
-
 .. _book-translation-locale-url:
 
 The Locale and the URL
@@ -825,9 +820,6 @@ texts* and complex expressions:
     Note that this only influences the current template, not any "included"
     templates (in order to avoid side effects).
 
-.. versionadded:: 2.1
-    The ``trans_default_domain`` tag is new in Symfony2.1
-
 PHP Templates
 ~~~~~~~~~~~~~
 

diff --git a/book/validation.rst b/book/validation.rst
@@ -205,8 +205,8 @@ Validation and Forms
 The ``validator`` service can be used at any time to validate any object.
 In reality, however, you'll usually work with the ``validator`` indirectly
 when working with forms. Symfony's form library uses the ``validator`` service
-internally to validate the underlying object after values have been submitted
-and bound. The constraint violations on the object are converted into ``FieldError``
+internally to validate the underlying object after values have been submitted.
+The constraint violations on the object are converted into ``FieldError``
 objects that can easily be displayed with your form. The typical form submission
 workflow looks like the following from inside a controller::
 
@@ -220,14 +220,12 @@ workflow looks like the following from inside a controller::
         $author = new Author();
         $form = $this->createForm(new AuthorType(), $author);
 
-        if ($request->isMethod('POST')) {
-            $form->bind($request);
+        $form->handleRequest($request);
 
-            if ($form->isValid()) {
-                // the validation passed, do something with the $author object
+        if ($form->isValid()) {
+            // the validation passed, do something with the $author object
 
-                return $this->redirect($this->generateUrl(...));
-            }
+            return $this->redirect($this->generateUrl(...));
         }
 
         return $this->render('BlogBundle:Author:form.html.twig', array(

diff --git a/bundles/map.rst.inc b/bundles/map.rst.inc
@@ -1,10 +1,5 @@
 * :doc:`SensioFrameworkExtraBundle </bundles/SensioFrameworkExtraBundle/index>`
 * :doc:`SensioGeneratorBundle </bundles/SensioGeneratorBundle/index>`
-* `JMSSecurityExtraBundle`_
-* `JMSDiExtraBundle`_
 * :doc:`DoctrineFixturesBundle </bundles/DoctrineFixturesBundle/index>`
 * :doc:`DoctrineMigrationsBundle </bundles/DoctrineMigrationsBundle/index>`
 * :doc:`DoctrineMongoDBBundle </bundles/DoctrineMongoDBBundle/index>`
-
-.. _`JMSSecurityExtraBundle`: http://jmsyst.com/bundles/JMSSecurityExtraBundle/1.2
-.. _`JMSDiExtraBundle`: http://jmsyst.com/bundles/JMSDiExtraBundle/1.1
diff --git a/components/class_loader.rst b/components/class_loader.rst
@@ -33,9 +33,6 @@ You can install the component in many different ways:
 Usage
 -----
 
-.. versionadded:: 2.1
-   The ``useIncludePath`` method was added in Symfony 2.1.
-
 Registering the :class:`Symfony\\Component\\ClassLoader\\UniversalClassLoader`
 autoloader is straightforward::
 

diff --git a/components/config/definition.rst b/components/config/definition.rst
@@ -100,7 +100,7 @@ node definition. Node type are available for:
 * scalar
 * boolean
 * array
-* enum (new in 2.1)
+* enum
 * integer (new in 2.2)
 * float (new in 2.2)
 * variable (no validation)