Merge branch '2.2' into 2.3

Author: weaverryan

book/installation.rst

@@ -236,9 +236,9 @@ If there are any issues, correct them now before moving on.
         $ rm -rf app/cache/*
         $ rm -rf app/logs/*
 
-		$ APACHEUSER=`ps aux | grep -E '[a]pache|[h]ttpd' | grep -v root | head -1 | cut -d\  -f1`
-		$ sudo chmod +a "$APACHEUSER allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
-		$ sudo chmod +a "`whoami` allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
+        $ APACHEUSER=`ps aux | grep -E '[a]pache|[h]ttpd' | grep -v root | head -1 | cut -d\  -f1`
+        $ sudo chmod +a "$APACHEUSER allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
+        $ sudo chmod +a "`whoami` allow delete,write,append,file_inherit,directory_inherit" app/cache app/logs
 
 
     **2. Using Acl on a system that does not support chmod +a**

book/routing.rst

@@ -422,13 +422,15 @@ longer required. The URL ``/blog`` will match this route and the value of
 the ``page`` parameter will be set to ``1``. The URL ``/blog/2`` will also
 match, giving the ``page`` parameter a value of ``2``. Perfect.
 
-+---------+------------+
-| /blog   | {page} = 1 |
-+---------+------------+
-| /blog/1 | {page} = 1 |
-+---------+------------+
-| /blog/2 | {page} = 2 |
-+---------+------------+
++--------------------+-------+-----------------------+
+| URL                | route | parameters            |
++====================+=======+=======================+
+| /blog              | blog  | {page} = 1            |
++--------------------+-------+-----------------------+
+| /blog/1            | blog  | {page} = 1            |
++--------------------+-------+-----------------------+
+| /blog/2            | blog  | {page} = 2            |
++--------------------+-------+-----------------------+
 
 .. tip::
 

components/http_foundation/sessions.rst

@@ -98,9 +98,6 @@ Session attributes
 * :method:`Symfony\\Component\\HttpFoundation\\Session\\Session::has`:
   Returns true if the attribute exists;
 
-* :method:`Symfony\\Component\\HttpFoundation\\Session\\Session::keys`:
-  Returns an array of stored attribute keys;
-
 * :method:`Symfony\\Component\\HttpFoundation\\Session\\Session::replace`:
   Sets multiple attributes at once: takes a keyed array and sets each key => value pair.
 

contributing/code/security.rst

@@ -96,6 +96,7 @@ Security Advisories
 This section indexes security vulnerabilities that were fixed in Symfony
 releases, starting from Symfony 1.0.0:
 
+* August 7, 2013: `Security releases: Symfony 2.0.24, 2.1.12, 2.2.5, and 2.3.3 released <http://symfony.com/blog/security-releases-symfony-2-0-24-2-1-12-2-2-5-and-2-3-3-released>`_ (`CVE-2013-4751 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4751>`_ and `CVE-2013-4752 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-4752>`_)
 * January 17, 2013: `Security release: Symfony 2.0.22 and 2.1.7 released <http://symfony.com/blog/security-release-symfony-2-0-22-and-2-1-7-released>`_ (`CVE-2013-1348 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1348>`_ and `CVE-2013-1397 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1397>`_)
 * December 20, 2012: `Security release: Symfony 2.0.20 and 2.1.5 <http://symfony.com/blog/security-release-symfony-2-0-20-and-2-1-5-released>`_  (`CVE-2012-6431 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-6431>`_ and `CVE-2012-6432 <http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-6432>`_)
 * November 29, 2012: `Security release: Symfony 2.0.19 and 2.1.4 <http://symfony.com/blog/security-release-symfony-2-0-19-and-2-1-4>`_

contributing/code/standards.rst

@@ -52,6 +52,8 @@ example containing most features described below:
          * @param array  $options
          *
          * @return string|null Transformed input
+         *
+         * @throws \RuntimeException
          */
         private function transformText($dummy, array $options = array())
         {

cookbook/controller/service.rst

@@ -180,13 +180,14 @@ service and use it directly::
     // src/Acme/HelloBundle/Controller/HelloController.php
     namespace Acme\HelloBundle\Controller;
 
+    use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
     use Symfony\Component\HttpFoundation\Response;
 
     class HelloController
     {
         private $templating;
 
-        public function __construct($templating)
+        public function __construct(EngineInterface $templating)
         {
             $this->templating = $templating;
         }

cookbook/form/dynamic_form_modification.rst

@@ -277,11 +277,14 @@ and fill in the listener logic::
 
                     $formOptions = array(
                         'class' => 'Acme\DemoBundle\Entity\User',
-                        'multiple' => false,
-                        'expanded' => false,
                         'property' => 'fullName',
                         'query_builder' => function(EntityRepository $er) use ($user) {
-                            // build a custom query, or call a method on your repository (even better!)
+                            // build a custom query
+                            // return $er->createQueryBuilder('u')->addOrderBy('fullName', 'DESC');
+
+                            // or call a method on your repository that returns the query builder
+                            // the $er is an instance of your UserRepository
+                            // return $er->createOrderByFullNameQueryBuilder();
                         },
                     );
 
@@ -295,6 +298,11 @@ and fill in the listener logic::
         // ...
     }
 
+.. note::
+
+    The ``multiple`` and ``expanded`` form options will default to false
+    because the type of the friend field is ``entity``.
+
 Using the Form
 ~~~~~~~~~~~~~~
 

cookbook/form/form_collections.rst

@@ -451,7 +451,7 @@ Next, add a ``by_reference`` option to the ``tags`` field and set it to ``false`
 
 With these two changes, when the form is submitted, each new ``Tag`` object
 is added to the ``Task`` class by calling the ``addTag`` method. Before this
-change, they were added internally by the form by calling ``$task->getTags()->add($task)``.
+change, they were added internally by the form by calling ``$task->getTags()->add($tag)``.
 That was just fine, but forcing the use of the "adder" method makes handling
 these new ``Tag`` objects easier (especially if you're using Doctrine, which
 we talk about next!).

cookbook/logging/monolog_email.rst

@@ -107,14 +107,6 @@ to and from addresses and the subject.
 You can combine these handlers with other handlers so that the errors still
 get logged on the server as well as the emails being sent:
 
-.. caution::
-
-    The default spool setting for swiftmailer is set to ``memory``, which
-    means that emails are sent at the very end of the request. However, this
-    does not work with buffered logs at the moment. In order to enable emailing
-    logs per the example below, you are must comment out the ``spool: { type: memory }``
-    line in the ``config.yml`` file.
-
 .. configuration-block::
 
     .. code-block:: yaml

cookbook/routing/custom_route_loader.rst

@@ -97,6 +97,8 @@ type you want. The resource name itself is not actually used in the example::
             // add the new route to the route collection:
             $routeName = 'extraRoute';
             $routes->add($routeName, $route);
+            
+            $this->loaded = true;
 
             return $routes;
         }

glossary.rst

@@ -11,6 +11,16 @@ Glossary
         selection of bundles, a sensible directory structure, a default
         configuration, and an optional configuration system.
 
+   Dependency Injection
+        The Dependency Injection is a design pattern highly used in the Symfony2 Framework.
+        It encourages loosely coupled and more maintainable architecture of an application.
+        The main principle of this pattern is that it allows developers to *inject* objects
+        (also known as services) in other objects, generally passing them as parameters.
+        Different levels of coupling between these objects can be established
+        depending on the method used to inject objects together.
+        The Dependency Injection pattern is the more often associated
+        to another specific type of object: the :doc:`/book/service_container`.
+
    Project
         A *Project* is a directory composed of an Application, a set of
         bundles, vendor libraries, an autoloader, and web front controller

reference/constraints/Country.rst

@@ -24,7 +24,7 @@ Basic Usage
         Acme\UserBundle\Entity\User:
             properties:
                 country:
-                    - Country:
+                    - Country: ~
 
     .. code-block:: php-annotations