Merge branch '2.0' into 2.1

Author: weaverryan

book/http_cache.rst

@@ -857,7 +857,7 @@ independent of the rest of the page.
     public function indexAction()
     {
         $response = $this->render('MyBundle:MyController:index.html.twig');
-        // set the shared max age - the also marks the response as public
+        // set the shared max age - which also marks the response as public
         $response->setSharedMaxAge(600);
 
         return $response;

book/templating.rst

@@ -982,7 +982,7 @@ you're actually using the templating engine service. For example::
 
     return $this->render('AcmeArticleBundle:Article:index.html.twig');
 
-is equivalent to:
+is equivalent to::
 
     $engine = $this->container->get('templating');
     $content = $engine->render('AcmeArticleBundle:Article:index.html.twig');

cookbook/doctrine/dbal.rst

@@ -108,10 +108,8 @@ mapping types, read Doctrine's `Custom Mapping Types`_ section of their document
 
             <doctrine:config>
                 <doctrine:dbal>
-                <doctrine:dbal default-connection="default">
-                    <doctrine:connection>
-                        <doctrine:mapping-type name="enum">string</doctrine:mapping-type>
-                    </doctrine:connection>
+                    <doctrine:type name="custom_first" class="Acme\HelloBundle\Type\CustomFirst" />
+                    <doctrine:type name="custom_second" class="Acme\HelloBundle\Type\CustomSecond" />
                 </doctrine:dbal>
             </doctrine:config>
         </container>
@@ -121,12 +119,9 @@ mapping types, read Doctrine's `Custom Mapping Types`_ section of their document
         // app/config/config.php
         $container->loadFromExtension('doctrine', array(
             'dbal' => array(
-                'connections' => array(
-                    'default' => array(
-                        'mapping_types' => array(
-                            'enum'  => 'string',
-                        ),
-                    ),
+                'types' => array(
+                    'custom_first'  => 'Acme\HelloBundle\Type\CustomFirst',
+                    'custom_second' => 'Acme\HelloBundle\Type\CustomSecond',
                 ),
             ),
         ));
@@ -165,8 +160,10 @@ mapping type:
 
             <doctrine:config>
                 <doctrine:dbal>
-                    <doctrine:type name="custom_first" class="Acme\HelloBundle\Type\CustomFirst" />
-                    <doctrine:type name="custom_second" class="Acme\HelloBundle\Type\CustomSecond" />
+                <doctrine:dbal default-connection="default">
+                    <doctrine:connection>
+                        <doctrine:mapping-type name="enum">string</doctrine:mapping-type>
+                    </doctrine:connection>
                 </doctrine:dbal>
             </doctrine:config>
         </container>
@@ -176,9 +173,12 @@ mapping type:
         // app/config/config.php
         $container->loadFromExtension('doctrine', array(
             'dbal' => array(
-                'types' => array(
-                    'custom_first'  => 'Acme\HelloBundle\Type\CustomFirst',
-                    'custom_second' => 'Acme\HelloBundle\Type\CustomSecond',
+                'connections' => array(
+                    'default' => array(
+                        'mapping_types' => array(
+                            'enum'  => 'string',
+                        ),
+                    ),
                 ),
             ),
         ));

cookbook/profiler/data_collector.rst

@@ -154,12 +154,12 @@ tag in your configuration. For example, assuming your template is in some
             data_collector.your_collector_name:
                 class: Acme\DebugBundle\Collector\Class\Name
                 tags:
-                    - { name: data_collector, template: "AcmeDebug:Collector:templatename", id: "your_collector_name" }
+                    - { name: data_collector, template: "AcmeDebugBundle:Collector:templatename", id: "your_collector_name" }
 
     .. code-block:: xml
 
         <service id="data_collector.your_collector_name" class="Acme\DebugBundle\Collector\Class\Name">
-            <tag name="data_collector" template="AcmeDebug:Collector:templatename" id="your_collector_name" />
+            <tag name="data_collector" template="AcmeDebugBundle:Collector:templatename" id="your_collector_name" />
         </service>
 
     .. code-block:: php

cookbook/service_container/event_listener.rst

@@ -19,19 +19,28 @@ event is just one of the core kernel events::
 
     use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
     use Symfony\Component\HttpFoundation\Response;
+    use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
     class AcmeExceptionListener
     {
         public function onKernelException(GetResponseForExceptionEvent $event)
         {
             // We get the exception object from the received event
             $exception = $event->getException();
-            $message = 'My Error says: ' . $exception->getMessage();
+            $message = 'My Error says: ' . $exception->getMessage() . ' with code: ' . $exception->getCode();
 
             // Customize our response object to display our exception details
             $response = new Response();
             $response->setContent($message);
-            $response->setStatusCode($exception->getStatusCode());
+
+            // HttpExceptionInterface is a special type of exception that
+            // holds status code and header details
+            if ($exception instanceof HttpExceptionInterface) {
+                $response->setStatusCode($exception->getStatusCode());
+                $response->headers->replace($exception->getHeaders());
+            } else {
+                $response->setStatusCode(500);
+            }
 
             // Send our modified response object to the event
             $event->setResponse($response);

cookbook/web_services/php_soap_extension.rst

@@ -4,16 +4,16 @@
 How to Create a SOAP Web Service in a Symfony2 Controller
 =========================================================
 
-Setting up a controller to act as a SOAP server is simple with a couple 
-tools.  You must, of course, have the `PHP SOAP`_ extension installed.  
-As the PHP SOAP extension can not currently generate a WSDL, you must either 
+Setting up a controller to act as a SOAP server is simple with a couple
+tools. You must, of course, have the `PHP SOAP`_ extension installed.
+As the PHP SOAP extension can not currently generate a WSDL, you must either
 create one from scratch or use a 3rd party generator.
 
 .. note::
 
-    There are several SOAP server implementations available for use with 
-    PHP. `Zend SOAP`_ and `NuSOAP`_ are two examples. Although we use 
-    the PHP SOAP extension in our examples, the general idea should still 
+    There are several SOAP server implementations available for use with
+    PHP. `Zend SOAP`_ and `NuSOAP`_ are two examples. Although we use
+    the PHP SOAP extension in our examples, the general idea should still
     be applicable to other implementations.
 
 SOAP works by exposing the methods of a PHP object to an external entity
@@ -22,8 +22,8 @@ which represents the functionality that you'll expose in your SOAP service.
 In this case, the SOAP service will allow the client to call a method called
 ``hello``, which happens to send an email::
 
-    // src/Acme/SoapBundle/HelloService.php
-    namespace Acme\SoapBundle;
+    // src/Acme/SoapBundle/Services/HelloService.php
+    namespace Acme\SoapBundle\Services;
 
     class HelloService
     {
@@ -58,32 +58,33 @@ a ``HelloService`` object properly:
 
     .. code-block:: yaml
 
-        # app/config/config.yml    
+        # app/config/config.yml
         services:
             hello_service:
-                class: Acme\DemoBundle\Services\HelloService
+                class: Acme\SoapBundle\Services\HelloService
                 arguments: [@mailer]
 
     .. code-block:: xml
 
         <!-- app/config/config.xml -->
         <services>
-         <service id="hello_service" class="Acme\DemoBundle\Services\HelloService">
+         <service id="hello_service" class="Acme\SoapBundle\Services\HelloService">
           <argument type="service" id="mailer"/>
          </service>
         </services>
 
-Below is an example of a controller that is capable of handling a SOAP 
-request.  If ``indexAction()`` is accessible via the route ``/soap``, then the 
+Below is an example of a controller that is capable of handling a SOAP
+request. If ``indexAction()`` is accessible via the route ``/soap``, then the
 WSDL document can be retrieved via ``/soap?wsdl``.
 
 .. code-block:: php
 
     namespace Acme\SoapBundle\Controller;
     
     use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+    use Symfony\Component\HttpFoundation\Response;
 
-    class HelloServiceController extends Controller 
+    class HelloServiceController extends Controller
     {
         public function indexAction()
         {
@@ -101,17 +102,17 @@ WSDL document can be retrieved via ``/soap?wsdl``.
         }
     }
 
-Take note of the calls to ``ob_start()`` and ``ob_get_clean()``.  These
-methods control `output buffering`_ which allows you to "trap" the echoed 
+Take note of the calls to ``ob_start()`` and ``ob_get_clean()``. These
+methods control `output buffering`_ which allows you to "trap" the echoed
 output of ``$server->handle()``. This is necessary because Symfony expects
 your controller to return a ``Response`` object with the output as its "content".
 You must also remember to set the "Content-Type" header to "text/xml", as
-this is what the client  will expect.  So, you use ``ob_start()`` to start
-buffering the STDOUT and use  ``ob_get_clean()`` to dump the echoed output
-into the content of the Response and clear the output buffer.  Finally, you're
+this is what the client  will expect. So, you use ``ob_start()`` to start
+buffering the STDOUT and use ``ob_get_clean()`` to dump the echoed output
+into the content of the Response and clear the output buffer. Finally, you're
 ready to return the ``Response``.
 
-Below is an example calling the service using `NuSOAP`_ client.  This example 
+Below is an example calling the service using `NuSOAP`_ client. This example
 assumes that the ``indexAction`` in the controller above is accessible via the
 route ``/soap``::
 

reference/constraints/Collection.rst

@@ -31,7 +31,7 @@ The ``Collection`` constraint allows you to validate the different keys of
 a collection individually. Take the following example::
 
     namespace Acme\BlogBundle\Entity;
-    
+
     class Author
     {
         protected $profileData = array(
@@ -63,7 +63,7 @@ blank but is no longer than 100 characters in length, you would do the following
                             - MaxLength:
                                 limit:   100
                                 message: Your short bio is too long!
-                    allowMissingfields: true
+                    allowMissingFields: true
 
     .. code-block:: php-annotations
 
@@ -84,7 +84,7 @@ blank but is no longer than 100 characters in length, you would do the following
              *             )
              *         }
              *     },
-             *     allowMissingfields = true
+             *     allowMissingFields = true
              * )
              */
              protected $profileData = array(
@@ -199,4 +199,4 @@ missingFieldsMessage
 **type**: ``Boolean`` **default**: ``The fields {{ fields }} are missing``
 
 The message shown if `allowMissingFields`_ is false and one or more fields
-are missing from the underlying collection.
+are missing from the underlying collection.

reference/forms/types/collection.rst

@@ -114,7 +114,7 @@ your form):
 
 .. code-block:: html
 
-    <input type="email" id="form_emails_1" name="form[emails][0]" value="[email protected]" />
+    <input type="email" id="form_emails_0" name="form[emails][0]" value="[email protected]" />
     <input type="email" id="form_emails_1" name="form[emails][1]" value="[email protected]" />
 
 To allow your user to add another email, just set `allow_add`_ to ``true``