Merge branch '2.2'

Conflicts:
	components/http_foundation/trusting_proxies.rst
	cookbook/session/index.rst
	reference/dic_tags.rst

Author: weaverryan

components/filesystem.rst

@@ -200,7 +200,7 @@ Return the relative path of a directory given another one::
         '/var/lib/symfony/src/Symfony/Component'
     );
     // returns 'videos'
-    $fs->makePathRelative('/tmp', '/tmp/videos');
+    $fs->makePathRelative('/tmp/videos', '/tmp')
 
 mirror
 ~~~~~~

components/http_foundation/trusting_proxies.rst

@@ -23,6 +23,7 @@ your proxy.
     use Symfony\Component\HttpFoundation\Request;
 
     $request = Request::createFromGlobals();
+
     // only trust proxy headers coming from this IP addresses
     $request->setTrustedProxies(array('192.0.0.1', '10.0.0.0/8'));
 

cookbook/form/dynamic_form_modification.rst

@@ -462,7 +462,7 @@ This can be used to get the ``SportMeetup`` id and retrieve it from the database
 given you have a reference to the object manager (if using doctrine). In
 the end, you have an event subscriber that listens to two different events,
 requires some external services and customizes the form. In such a situation,
-it's probably better to define this as a service rather than using an anonymouse
+it's probably better to define this as a service rather than using an anonymous
 function as the event listener callback.
 
 The subscriber would now look like::

cookbook/index.rst

@@ -14,6 +14,7 @@ The Cookbook
     configuration/index
     serializer
     service_container/index
+    session/index
     bundles/index
     email/index
     testing/index

cookbook/map.rst.inc

@@ -143,6 +143,10 @@
   * :doc:`/cookbook/service_container/scopes`
   * :doc:`/cookbook/service_container/compiler_passes`
 
+* :doc:`/cookbook/session/index`
+
+  * :doc:`/cookbook/session/proxy_examples`
+
 * **symfony1**
 
   * :doc:`/cookbook/symfony1`

cookbook/session/index.rst

@@ -5,3 +5,4 @@ Sessions
     :maxdepth: 2
 
     php_bridge
+    proxy_examples

cookbook/session/proxy_examples.rst

@@ -0,0 +1,84 @@
+.. index::
+   single: Sessions, session proxy, proxy
+
+Session Proxy Examples
+----------------------
+
+The session proxy mechanism has a variety of uses and this example demonstrates
+two common uses. Rather than injecting the session handler as normal, a handler
+is injected into the proxy and registered with the session storage driver::
+
+    use Symfony\Component\HttpFoundation\Session\Session;
+    use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
+    use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionStorage;
+
+    $proxy = new YourProxy(new PdoSessionStorage());
+    $session = new Session(new NativeSessionStorage($proxy));
+
+Below, you'll learn two real examples that can be used for ``YourProxy``:
+encryption of session data and readonly guest session.
+
+Encryption of Session Data
+--------------------------
+
+If you wanted to encrypt the session data, you could use the proxy to encrypt
+and decrypt the session as required::
+
+    use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
+
+    class EncryptedSessionProxy extends SessionHandlerProxy
+    {
+        private $key;
+
+        public function __construct(\SessionHandlerInterface $handler, $key)
+        {
+            $this->key = $key;
+
+            parent::__construct($handler);
+        }
+
+        public function read($id)
+        {
+            $data = parent::write($id, $data);
+
+            return mcrypt_decrypt(\MCRYPT_3DES, $this->key, $data);
+        }
+
+        public function write($id, $data)
+        {
+            $data = mcrypt_encrypt(\MCRYPT_3DES, $this->key, $data);
+
+            return parent::write($id, $data);
+        }
+    }
+
+Readonly Guest Sessions
+-----------------------
+
+There are some applications where a session is required for guest users, but
+there is no particular need to persist the session. In this case you can
+intercept the session before it writes::
+
+    use Foo\User;
+    use Symfony\Component\HttpFoundation\Session\Storage\Proxy\SessionHandlerProxy;
+
+    class ReadOnlyGuestSessionProxy extends SessionHandlerProxy
+    {
+        private $user;
+
+        public function __construct(\SessionHandlerInterface $handler, User $user)
+        {
+            $this->user = $user;
+
+            parent::__construct($handler);
+        }
+
+        public function write($id, $data)
+        {
+            if ($this->user->isGuest()) {
+                return;
+            }
+
+            return parent::write($id, $data);
+        }
+    }

reference/configuration/framework.rst

@@ -26,6 +26,7 @@ Configuration
     * enabled
     * field_name
 * `session`_
+    * `name`_
     * `cookie_lifetime`_
     * `cookie_path`_
     * `cookie_domain`_
@@ -158,6 +159,14 @@ csrf_protection
 session
 ~~~~~~~
 
+name
+....
+
+**type**: ``string`` **default**: ``null``
+
+This specifies the name of the session cookie. By default it will use the cookie
+name which is defined in the ``php.ini`` with the ``session.name`` directive.
+
 cookie_lifetime
 ...............
 

reference/constraints/CardScheme.rst

@@ -35,7 +35,7 @@ on an  object that will contain a credit card number.
                 cardNumber:
                     - CardScheme:
                         schemes: [VISA]
-                        message: You credit card number is invalid.
+                        message: Your credit card number is invalid.
 
     .. code-block:: xml
 
@@ -46,7 +46,7 @@ on an  object that will contain a credit card number.
                     <option name="schemes">
                         <value>VISA</value>
                     </option>
-                    <option name="message">You credit card number is invalid.</option>
+                    <option name="message">Your credit card number is invalid.</option>
                 </constraint>
             </property>
         </class>
@@ -61,7 +61,7 @@ on an  object that will contain a credit card number.
         class Transaction
         {
             /**
-             * @Assert\CardScheme(schemes = {"VISA"}, message = "You credit card number is invalid.")
+             * @Assert\CardScheme(schemes = {"VISA"}, message = "Your credit card number is invalid.")
              */
             protected $cardNumber;
         }
@@ -84,7 +84,7 @@ on an  object that will contain a credit card number.
                     'schemes' => array(
                         'VISA'
                     ),
-                    'message' => 'You credit card number is invalid.',
+                    'message' => 'Your credit card number is invalid.',
                 )));
             }
         }

reference/constraints/Range.rst

@@ -48,8 +48,8 @@ the following:
         {
             /**
              * @Assert\Range(
-             *      min = "120",
-             *      max = "180",
+             *      min = 120,
+             *      max = 180,
              *      minMessage = "You must be at least 120cm tall to enter",
              *      maxMessage = "You cannot be taller than 180cm to enter"
              * )

reference/constraints/UserPassword.rst

@@ -3,11 +3,11 @@ UserPassword
 
 .. note::
 
-    Since Symfony 2.2, the `UserPassword*` classes in the
-    `Symfony\Component\Security\Core\Validator\Constraint` namespace are
+    Since Symfony 2.2, the ``UserPassword*`` classes in the
+    ``Symfony\\Component\\Security\\Core\\Validator\\Constraint`` namespace are
     deprecated and will be removed in Symfony 2.3. Please use the
-    `UserPassword*` classes in the
-    `Symfony\Component\Security\Core\Validator\Constraints` namespace instead.
+    ``UserPassword*`` classes in the
+    ``Symfony\\Component\\Security\\Core\\Validator\\Constraints`` namespace instead.
 
 This validates that an input value is equal to the current authenticated
 user's password. This is useful in a form where a user can change his password,

reference/dic_tags.rst

@@ -55,8 +55,6 @@ may also be tags in other bundles you use that aren't listed here.
 +-----------------------------------+---------------------------------------------------------------------------+
 | `security.remember_me_aware`_     | To allow remember me authentication                                       |
 +-----------------------------------+---------------------------------------------------------------------------+
-| `security.listener.factory`_      | Necessary when creating a custom authentication system                    |
-+-----------------------------------+---------------------------------------------------------------------------+
 | `serializer.encoder`_             | Register a new encoder in the ``serializer`` service                      |
 +-----------------------------------+---------------------------------------------------------------------------+
 | `serializer.normalizer`_          | Register a new normalizer in the ``serializer`` service                   |
@@ -712,14 +710,6 @@ of your configuration, and tag it with ``routing.loader``:
 
 For more information, see :doc:`/cookbook/routing/custom_route_loader`.
 
-security.listener.factory
--------------------------
-
-**Purpose**: Necessary when creating a custom authentication system
-
-This tag is used when creating your own custom authentication system. For
-details, see :doc:`/cookbook/security/custom_authentication_provider`.
-
 security.remember_me_aware
 --------------------------