Merge branch '2.2' into 2.3

weaverryan · weaverryan · commit 08056fd5a8cf · 2013-10-02T18:50:11.000-04:00
diff --git a/book/forms.rst b/book/forms.rst
@@ -431,11 +431,6 @@ Validation is a very powerful feature of Symfony2 and has its own
 Validation Groups
 ~~~~~~~~~~~~~~~~~
 
-.. tip::
-
-    If you're not using :ref:`validation groups <book-validation-validation-groups>`,
-    then you can skip this section.
-
 If your object takes advantage of :ref:`validation groups <book-validation-validation-groups>`,
 you'll need to specify which validation group(s) your form should use::
 
@@ -1073,6 +1068,10 @@ the choice is ultimately up to you.
     The field data can be accessed in a controller with::
 
         $form->get('dueDate')->getData();
+        
+    In addition, the data of an unmapped field can also be modified directly::
+
+        $form->get('dueDate')->setData(new \DateTime());
 
 Defining your Forms as Services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/components/config/definition.rst b/components/config/definition.rst
@@ -177,11 +177,12 @@ Or you may define a prototype for each node inside an array node::
         ->children()
             ->arrayNode('connections')
                 ->prototype('array')
-                ->children()
-                    ->scalarNode('driver')->end()
-                    ->scalarNode('host')->end()
-                    ->scalarNode('username')->end()
-                    ->scalarNode('password')->end()
+                    ->children()
+                        ->scalarNode('driver')->end()
+                        ->scalarNode('host')->end()
+                        ->scalarNode('username')->end()
+                        ->scalarNode('password')->end()
+                    ->end()
                 ->end()
             ->end()
         ->end()
diff --git a/components/options_resolver.rst b/components/options_resolver.rst
@@ -50,10 +50,7 @@ The advantages of doing this will become more obvious as you continue::
         $this->options = $resolver->resolve($options);
     }
 
-The ``$options`` property is an instance of
-:class:`Symfony\\Component\\OptionsResolver\\Options`, which implements
-:phpclass:`ArrayAccess`, :phpclass:`Iterator` and :phpclass:`Countable`. That
-means you can handle it just like a normal array::
+The options property now is a well defined array with all resolved options readily available::
 
     // ...
     public function getHost()
@@ -76,8 +73,6 @@ Now, try to actually use the class::
         'password' => 'pa$$word',
     ));
 
-    echo $mailer->getPassword();
-
 Right now, you'll receive a
 :class:`Symfony\\Component\\OptionsResolver\\Exception\\InvalidOptionsException`,
 which tells you that the options ``host`` and ``password`` do not exist.
diff --git a/cookbook/bundles/installation.rst b/cookbook/bundles/installation.rst
@@ -21,7 +21,7 @@ Before you can use composer to install a bundle, you should look for a
 
     Packagist is the main archive for Composer. If you are searching
     for a bundle, the best thing you can do is check out
-    `KnpBundles`_, it is the unofficial achive of Symfony Bundles. If
+    `KnpBundles`_, it is the unofficial archive of Symfony Bundles. If
     a bundle contains a ``README`` file, it is displayed there and if it
     has a Packagist package it shows a link to the package. It's a
     really useful site to begin searching for bundles.
diff --git a/cookbook/form/dynamic_form_modification.rst b/cookbook/form/dynamic_form_modification.rst
@@ -485,8 +485,8 @@ The type would now look like::
     namespace Acme\DemoBundle\Form\Type;
 
     // ...
-    Acme\DemoBundle\Entity\Sport;
-    Symfony\Component\Form\FormInterface;
+    use Acme\DemoBundle\Entity\Sport;
+    use Symfony\Component\Form\FormInterface;
 
     class SportMeetupType extends AbstractType
     {
@@ -497,32 +497,28 @@ The type would now look like::
             ;
 
             $formModifier = function(FormInterface $form, Sport $sport) {
-                $positions = $data->getSport()->getAvailablePositions();
+                $positions = $sport->getAvailablePositions();
 
                 $form->add('position', 'entity', array('choices' => $positions));
-            }
+            };
 
             $builder->addEventListener(
                 FormEvents::PRE_SET_DATA,
-                function(FormEvent $event) {
-                    $form = $event->getForm();
-
+                function(FormEvent $event) use ($formModifier) {
                     // this would be your entity, i.e. SportMeetup
                     $data = $event->getData();
 
-                    $formModifier($event->getForm(), $sport);
+                    $formModifier($event->getForm(), $data->getSport());
                 }
             );
 
             $builder->get('sport')->addEventListener(
                 FormEvents::POST_SUBMIT,
                 function(FormEvent $event) use ($formModifier) {
                     // It's important here to fetch $event->getForm()->getData(), as
-                    // $event->getData() will get you the client data (this is, the ID)
+                    // $event->getData() will get you the client data (that is, the ID)
                     $sport = $event->getForm()->getData();
 
-                    $positions = $sport->getAvailablePositions();
-
                     // since we've added the listener to the child, we'll have to pass on
                     // the parent to the callback functions!
                     $formModifier($event->getForm()->getParent(), $sport);
diff --git a/cookbook/routing/redirect_in_config.rst b/cookbook/routing/redirect_in_config.rst
@@ -23,7 +23,7 @@ Your configuration will look like this:
         path:     /
         defaults:
             _controller: FrameworkBundle:Redirect:urlRedirect
-            route: /app
+            path: /app
             permanent: true
 
 In this example, you configure a route for the ``/`` path and let :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController`
diff --git a/cookbook/security/acl.rst b/cookbook/security/acl.rst
@@ -9,6 +9,17 @@ cannot only be based on the person (``Token``) who is requesting access, but
 also involve a domain object that access is being requested for. This is where
 the ACL system comes in.
 
+.. sidebar:: Alternatives to ACLS
+
+    Using ACL's isn't trivial, and for simpler use cases, it may be overkill.
+    If your permission logic could be described by just writing some code (e.g.
+    to check if a Blog is owned by the current User), then consider using
+    :doc:`voters </cookbook/security/voters>`. A voter is passed the object
+    being voted on, which you can use to make complex decisions and effectively
+    implement your own ACL. Enforcing authorization (e.g. the ``isGranted``
+    part) will look similar to what you see in this entry, but your voter
+    class will handle the logic behind the scenes, instead of the ACL system.
+
 Imagine you are designing a blog system where your users can comment on your
 posts. Now, you want a user to be able to edit his own comments, but not those
 of other users; besides, you yourself want to be able to edit all comments. In
diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst
@@ -151,3 +151,5 @@ These options inherit from the :doc:`field</reference/forms/types/form>` type:
 .. include:: /reference/forms/types/options/inherit_data.rst.inc
 
 .. include:: /reference/forms/types/options/error_mapping.rst.inc
+
+.. _`RFC 3339`: http://tools.ietf.org/html/rfc3339
diff --git a/reference/forms/types/options/date_format.rst.inc b/reference/forms/types/options/date_format.rst.inc
@@ -1,7 +1,7 @@
 format
 ~~~~~~
 
-**type**: ``integer`` or ``string`` **default**: ``IntlDateFormatter::MEDIUM``
+**type**: ``integer`` or ``string`` **default**: `IntlDateFormatter::MEDIUM`_ (or ``yyyy-MM-dd`` if `widget`_ is ``single_text``)
 
 Option passed to the ``IntlDateFormatter`` class, used to transform user input
 into the proper format. This is critical when the `widget`_ option is
@@ -10,13 +10,19 @@ By default, the format is determined based on the current user locale: meaning
 that *the expected format will be different for different users*. You
 can override it by passing the format as a string.
 
-For more information on valid formats, see `Date/Time Format Syntax`_. For
-example, to render a single text box that expects the user to enter ``yyyy-MM-dd``,
-use the following options::
+For more information on valid formats, see `Date/Time Format Syntax`_::
 
     $builder->add('date_created', 'date', array(
         'widget' => 'single_text',
+        // this is actually the default format for single_text
         'format' => 'yyyy-MM-dd',
     ));
 
+.. note::
+
+    If you want your field to be rendered as an HTML5 "date" field, you have
+    use a ``single_text`` widget with the ``yyyy-MM-dd`` format (the `RFC 3339`_
+    format) which is the default value if you use the ``single_text`` widget.
+
 .. _`Date/Time Format Syntax`: http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax
+.. _`IntlDateFormatter::MEDIUM`: http://www.php.net/manual/en/class.intldateformatter.php#intl.intldateformatter-constants
