Merge branch '2.0'

Conflicts:
	cookbook/form/dynamic_form_generation.rst
	cookbook/form/form_collections.rst
	cookbook/form/use_virtuals_forms.rst

Author: weaverryan

book/page_creation.rst

@@ -984,7 +984,7 @@ in mind:
 * the **configuration** for each bundle lives in the ``Resources/config``
   directory of the bundle and can be specified in YAML, XML or PHP;
 
-* the global **application configuration** lives in the ``app/Resources/config``
+* the global **application configuration** lives in the ``app/config``
   directory;
 
 * each **environment** is accessible via a different front controller (e.g.

book/service_container.rst

@@ -877,8 +877,8 @@ the framework.
 
 .. _book-service-container-tags:
 
-Tags (``tags``)
----------------
+Tags
+----
 
 In the same way that a blog post on the Web might be tagged with things such
 as "Symfony" or "PHP", services configured in your container can also be

book/templating.rst

@@ -1066,6 +1066,11 @@ from the bundle to ``app/Resources/AcmeBlogBundle/views/Blog/index.html.twig``
 (the ``app/Resources/AcmeBlogBundle`` directory won't exist, so you'll need
 to create it). You're now free to customize the template.
 
+.. caution::
+
+    If you add a template in a new location, you *may* need to clear your
+    cache (``php app/console cache:clear``), even if you are in debug mode.
+
 This logic also applies to base bundle templates. Suppose also that each
 template in ``AcmeBlogBundle`` inherits from a base template called
 ``AcmeBlogBundle::layout.html.twig``. Just as before, Symfony2 will look in

book/translation.rst

@@ -227,7 +227,7 @@ is done just as before:
     .. code-block:: yaml
 
         # messages.fr.yml
-        'Hello %name%': Hello %name%
+        'Hello %name%': Bonjour %name%
 
 .. note::
 
@@ -950,7 +950,7 @@ Create a translation file under the ``validators`` catalog for the constraint me
 
     .. code-block:: xml
 
-        <!-- validators.fr.xliff -->
+        <!-- validators.en.xliff -->
         <?xml version="1.0"?>
         <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
             <file source-language="en" datatype="plaintext" original="file.ext">
@@ -965,14 +965,14 @@ Create a translation file under the ``validators`` catalog for the constraint me
 
     .. code-block:: php
 
-        // validators.fr.php
+        // validators.en.php
         return array(
             'author.name.not_blank' => 'Please enter an author name.',
         );
 
     .. code-block:: yaml
 
-        # validators.fr.yml
+        # validators.en.yml
         author.name.not_blank: Please enter an author name.
 
 Summary

components/console.rst

@@ -261,6 +261,7 @@ console::
 
     use Symfony\Component\Console\Application;
     use Symfony\Component\Console\Tester\CommandTester;
+    use Acme\DemoBundle\Command\GreetCommand;
 
     class ListCommandTest extends \PHPUnit_Framework_TestCase
     {
@@ -287,8 +288,8 @@ You can test sending arguments and options to the command by passing them
 as an array to the :method:`Symfony\\Component\\Console\\Tester\\CommandTester::getDisplay`
 method::
 
-    use Symfony\Component\Console\Tester\CommandTester;
     use Symfony\Component\Console\Application;
+    use Symfony\Component\Console\Tester\CommandTester;
     use Acme\DemoBundle\Command\GreetCommand;
 
     class ListCommandTest extends \PHPUnit_Framework_TestCase

cookbook/event_dispatcher/class_extension.rst

@@ -17,7 +17,7 @@ magic ``__call()`` method in the class you want to be extended like this:
         {
             // create an event named 'foo.method_is_not_found'
             $event = new HandleUndefinedMethodEvent($this, $method, $arguments);
-            $this->dispatcher->dispatch($this, 'foo.method_is_not_found', $event);
+            $this->dispatcher->dispatch('foo.method_is_not_found', $event);
 
             // no listener was able to process the event? The method does not exist
             if (!$event->isProcessed()) {
@@ -122,4 +122,4 @@ instance of ``Bar`` with the ``foo.method_is_not_found`` event:
 .. code-block:: php
 
     $bar = new Bar();
-    $dispatcher->addListener('foo.method_is_not_found', $bar);
+    $dispatcher->addListener('foo.method_is_not_found', array($bar, 'onFooMethodIsNotFound'));

cookbook/form/dynamic_form_generation.rst

@@ -7,8 +7,8 @@ How to Dynamically Generate Forms Using Form Events
 Before jumping right into dynamic form generation, let's have a quick review 
 of what a bare form class looks like::
 
-    // src/Acme/DemoBundle/Form/ProductType.php
-    namespace Acme\DemoBundle\Form;
+    // src/Acme/DemoBundle/Form/Type/ProductType.php
+    namespace Acme\DemoBundle\Form\Type;
 
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\FormBuilderInterface;
@@ -53,8 +53,8 @@ So, instead of directly adding that "name" widget via our ProductType form
 class, let's delegate the responsibility of creating that particular field 
 to an Event Subscriber::
 
-    // src/Acme/DemoBundle/Form/ProductType.php
-    namespace Acme\DemoBundle\Form
+    // src/Acme/DemoBundle/Form/Type/ProductType.php
+    namespace Acme\DemoBundle\Form\Type;
 
     use Symfony\Component\Form\AbstractType
     use Symfony\Component\Form\FormBuilderInterface;

cookbook/form/form_collections.rst

@@ -603,12 +603,14 @@ the relationship between the removed ``Tag`` and ``Task`` object.
                 throw $this->createNotFoundException('No task found for is '.$id);
             }
 
+            $originalTags = array();
+
             // Create an array of the current Tag objects in the database
             foreach ($task->getTags() as $tag) $originalTags[] = $tag;
           
             $editForm = $this->createForm(new TaskType(), $task);
 
-               if ('POST' === $request->getMethod()) {
+            if ('POST' === $request->getMethod()) {
                 $editForm->bind($this->getRequest());
 
                 if ($editForm->isValid()) {

cookbook/form/form_customization.rst

@@ -478,7 +478,7 @@ your template file rather than adding the template as a resource:
 
 .. code-block:: html+jinja
 
-	{% form_theme form 'form_table_layout.html.twig' %}
+    {% form_theme form 'form_table_layout.html.twig' %}
 
 Note that the ``form`` variable in the above code is the form view variable
 that you passed to your template.
@@ -571,7 +571,7 @@ your template file rather than adding the template as a resource:
 
 .. code-block:: html+php
 
-	<?php $view['form']->setTheme($form, array('FrameworkBundle:FormTable')); ?>
+    <?php $view['form']->setTheme($form, array('FrameworkBundle:FormTable')); ?>
 
 Note that the ``$form`` variable in the above code is the form view variable
 that you passed to your template.

cookbook/form/use_virtuals_forms.rst

@@ -142,7 +142,7 @@ Look at the result::
     }
 
 With the virtual option set to false (default behavior), the Form Component
-expect each underlying object to have a ``foo`` (or ``bar``) property that
+expects each underlying object to have a ``foo`` (or ``bar``) property that
 is either some object or array which contains the four location fields.
 Of course, we don't have this object/array in our entities and we don't want it!
 

cookbook/map.rst.inc

@@ -125,6 +125,10 @@
   * :doc:`/cookbook/testing/profiling`
   * :doc:`/cookbook/testing/doctrine`
 
+* :doc:`/cookbook/validation/index`
+
+  * :doc:`/cookbook/validation/custom_constraint`
+
 * :doc:`/cookbook/web_services/index`
 
   * :doc:`/cookbook/web_services/php_soap_extension`

cookbook/validation/custom_constraint.rst

@@ -226,3 +226,31 @@ With this, the validator ``validate()`` method gets an object as its first argum
         }
     }
 
+Note that a class constraint validator is applied to the class itself, and
+not to the property:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # src/Acme/BlogBundle/Resources/config/validation.yml
+        Acme\DemoBundle\Entity\AcmeEntity:
+            constraints:
+                - ContainsAlphanumeric
+
+    .. code-block:: php-annotations
+
+        /**
+         * @AcmeAssert\ContainsAlphanumeric
+         */
+        class AcmeEntity
+        {
+            // ...
+        }
+
+    .. code-block:: xml
+
+        <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
+        <class name="Acme\DemoBundle\Entity\AcmeEntity">
+            <constraint name="ContainsAlphanumeric" />
+        </class>

reference/configuration/framework.rst

@@ -18,6 +18,7 @@ Configuration
 * `secret`_
 * `ide`_
 * `test`_
+* `trust_proxy_headers`_
 * `form`_
     * enabled
 * `csrf_protection`_
@@ -81,6 +82,17 @@ services related to testing your application (e.g. ``test.client``) are loaded.
 This setting should be present in your ``test`` environment (usually via
 ``app/config/config_test.yml``). For more information, see :doc:`/book/testing`.
 
+trust_proxy_headers
+~~~~~~~~~~~~~~~~~~~
+
+**type**: ``Boolean``
+
+Configures if HTTP headers (like ``HTTP_X_FORWARDED_FOR``, ``X_FORWARDED_PROTO``, and
+``X_FORWARDED_HOST``) are trusted as indication for an SSL connection. By default, it is
+set to ``false`` and only SSL_HTTPS connections are indicated as secure.
+
+You should enable this setting if your application is behind a reverse proxy.
+
 .. _reference-framework-form:
 
 form

reference/constraints/Callback.rst

@@ -40,17 +40,6 @@ Setup
                 - Callback:
                     methods:   [isAuthorValid]
 
-    .. code-block:: xml
-
-        <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
-        <class name="Acme\BlogBundle\Entity\Author">
-            <constraint name="Callback">
-                <option name="methods">
-                    <value>isAuthorValid</value>
-                </option>
-            </constraint>
-        </class>
-
     .. code-block:: php-annotations
 
         // src/Acme/BlogBundle/Entity/Author.php
@@ -63,6 +52,17 @@ Setup
         {
         }
 
+    .. code-block:: xml
+
+        <!-- src/Acme/BlogBundle/Resources/config/validation.xml -->
+        <class name="Acme\BlogBundle\Entity\Author">
+            <constraint name="Callback">
+                <option name="methods">
+                    <value>isAuthorValid</value>
+                </option>
+            </constraint>
+        </class>
+
 The Callback Method
 -------------------