@@ -725,7 +725,7 @@ specify it:
 
 <?php echo $view['form']->label($form['task'], 'Task Description') ?>
 
-Finally, some field types have additional rendering options that can be passed
+Some field types have additional rendering options that can be passed
 to the widget. These options are documented with each type, but one common
 options is ``attr``, which allows you to modify attributes on the form element.
 The following would add the ``task_field`` class to the rendered input text
@@ -743,6 +743,33 @@ field:
 'attr' => array('class' => 'task_field'),
 )) ?>
 
+If you need to render form fields "by hand" then you can access individual
+values for fields such as the ``id``, ``name`` and ``label``. For example
+to get the ``id``:
+
+.. configuration-block::
+
+.. code-block:: html+jinja
+
+{{ form.task.vars.id }}
+
+.. code-block:: html+php
+
+<?php echo $form['task']->get('id') ?>
+
+To get the value used for the form field's name attribute you need to use
+the ``full_name`` value:
+
+.. configuration-block::
+
+.. code-block:: html+jinja
+
+{{ form.task.vars.full_name }}
+
+.. code-block:: html+php
+
+<?php echo $form['task']->get('full_name') ?>
+
 Twig Template Function Reference
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -830,15 +857,15 @@ the choice is ultimately up to you.
 }
 
 .. tip::
-
-When mapping forms to objects, all fields are mapped. Any fields on the
-form that do not exist on the mapped object will cause an exception to
-be thrown.
-
-In cases where you need extra fields in the form (for example: a "do you
-agree with these terms" checkbox) that will not be mapped to the underlying
-object, you need to set the property_path option to ``false``::
-
+
+When mapping forms to objects, all fields are mapped. Any fields on the
+form that do not exist on the mapped object will cause an exception to
+be thrown.
+
+In cases where you need extra fields in the form (for example: a "do you
+agree with these terms" checkbox) that will not be mapped to the underlying
+object, you need to set the property_path option to ``false``::
+
 public function buildForm(FormBuilder $builder, array $options)
 {
 $builder->add('task');

@@ -173,7 +173,10 @@ finely tuned via a set of options you can set by overriding the ``getOptions()``
 method::
 
 // app/AppCache.php
-class AppCache extends Cache
+
+use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
+
+class AppCache extends HttpCache
 {
 protected function getOptions()
 {
@@ -654,7 +657,7 @@ exposing a simple and efficient pattern::
 } else {
 // do more work here - like retrieving more data
 $comments = // ...
-
+
 // or render a template with the $response you've already started
 return $this->render(
 'MyBundle:MyController:article.html.twig',

@@ -263,6 +263,8 @@ the user is connecting via a secured connection (i.e. ``https``).
 In fact, every public property used in the previous example is some instance
 of the ParameterBag.
 
+.. _book-fundamentals-attributes:
+
 The Request class also has a public ``attributes`` property, which holds
 special data related to how the application works internally. For the
 Symfony2 framework, the ``attributes`` holds the values returned by the

@@ -31,7 +31,7 @@ command:
 $ phpunit -c app/
 
 The ``-c`` option tells PHPUnit to look in the ``app/`` directory for a configuration
-file. If you're curious about how the PHPUnit options, check out the ``app/phpunit.xml.dist``
+file. If you're curious about the PHPUnit options, check out the ``app/phpunit.xml.dist``
 file.
 
 .. tip::
@@ -258,10 +258,10 @@ document::
 To get you started faster, here is a list of the most common and
 useful test assertions::
 
-// Assert that there is exactly one h2 tag with the class "subtitle"
+// Assert that there is more than one h2 tag with the class "subtitle"
 $this->assertTrue($crawler->filter('h2.subtitle')->count() > 0);
 
-// Assert that there are 4 h2 tags on the page
+// Assert that there are exactly 4 h2 tags on the page
 $this->assertEquals(4, $crawler->filter('h2')->count());
 
 // Assert the the "Content-Type" header is "application/json"
@@ -288,7 +288,7 @@ document::
 Working with the Test Client
 -----------------------------
 
-The test Client simulates an HTTP client like a browser and makes requests
+The Test Client simulates an HTTP client like a browser and makes requests
 into your Symfony2 application::
 
 $crawler = $client->request('GET', '/hello/Fabien');
@@ -486,9 +486,9 @@ Many other methods are also available:
 +------------------------+----------------------------------------------------+
 | ``previousAll()`` | All preceding siblings |
 +------------------------+----------------------------------------------------+
-| ``parents()`` | Parent nodes |
+| ``parents()`` | Returns the parent nodes |
 +------------------------+----------------------------------------------------+
-| ``children()`` | Children |
+| ``children()`` | Returns children nodes |
 +------------------------+----------------------------------------------------+
 | ``reduce($lambda)`` | Nodes for which the callable does not return false |
 +------------------------+----------------------------------------------------+
@@ -591,7 +591,7 @@ that overrides the default ones::
 And if you want to simulate a specific HTTP method for the form, pass it as a
 second argument::
 
-$form = $crawler->form(array(), 'DELETE');
+$form = $buttonCrawlerNode->form(array(), 'DELETE');
 
 The Client can submit ``Form`` instances::
 

@@ -68,6 +68,22 @@ add the following to it::
 }
 }
 
+You also need to create the file to run at the command line which creates
+an ``Application`` and adds commands to it:
+
+.. code-block::php
+
+#!/usr/bin/env php
+# app/console
+<?php
+
+use Acme\DemoBundle\Command\GreetCommand;
+use Symfony\Component\Console\Application;
+
+$application = new Application();
+$application->add(new GreetCommand);
+$application->run();
+
 Test the new console command by running the following
 
 .. code-block:: bash
@@ -247,8 +263,7 @@ console::
 {
 public function testExecute()
 {
-// mock the Kernel or create one depending on your needs
-$application = new Application($kernel);
+$application = new Application();
 $application->add(new GreetCommand());
 
 $command = $application->find('demo:greet');
@@ -265,31 +280,39 @@ The :method:`Symfony\\Component\\Console\\Tester\\CommandTester::getDisplay`
 method returns what would have been displayed during a normal call from the
 console.
 
-.. tip::
+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::
 
-You can also test a whole console application by using
-:class:`Symfony\\Component\\Console\\Tester\\ApplicationTester`.
+use Symfony\Component\Console\Tester\CommandTester;
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Acme\DemoBundle\Command\GreetCommand;
 
-Getting Services from the Service Container
--------------------------------------------
+class ListCommandTest extends \PHPUnit_Framework_TestCase
+{
 
-By using :class:`Symfony\\Bundle\\FrameworkBundle\\Command\\ContainerAwareCommand`
-as the base class for the command (instead of the more basic
-:class:`Symfony\\Component\\Console\\Command\\Command`), you have access to the
-service container. In other words, you have access to any configured service.
-For example, you could easily extend the task to be translatable::
+//--
 
-protected function execute(InputInterface $input, OutputInterface $output)
-{
-$name = $input->getArgument('name');
-$translator = $this->getContainer()->get('translator');
-if ($name) {
-$output->writeln($translator->trans('Hello %name%!', array('%name%' => $name)));
-} else {
-$output->writeln($translator->trans('Hello!'));
+public function testNameIsOutput()
+{
+$application = new Application();
+$application->add(new GreetCommand());
+
+$command = $application->find('demo:greet');
+$commandTester = new CommandTester($command);
+$commandTester->execute(
+array('command' => $command->getName(), 'name' => 'Fabien')
+);
+
+$this->assertRegExp('/Fabien/', $commandTester->getDisplay());
 }
 }
 
+.. tip::
+
+You can also test a whole console application by using
+:class:`Symfony\\Component\\Console\\Tester\\ApplicationTester`.
+
 Calling an existing Command
 ---------------------------
 

@@ -306,7 +306,7 @@ directly::
 
 use Goutte\Client;
 
-// make a real reqeust to an external site
+// make a real request to an external site
 $client = new Client();
 $crawler = $client->request('GET', 'https://.com/login');
 

@@ -52,6 +52,8 @@ can be accessed via several public properties:
 
 * ``cookies``: equivalent of ``$_COOKIE``;
 
+* ``attributes``: no equivalent - used by your app to store other data (see :ref:`below<component-foundation-attributes>`)
+
 * ``files``: equivalent of ``$_FILE``;
 
 * ``server``: equivalent of ``$_SERVER``;
@@ -68,6 +70,8 @@ instance (or a sub-class of), which is a data holder class:
 
 * ``cookies``: :class:`Symfony\\Component\\HttpFoundation\\ParameterBag`;
 
+* ``attributes``: :class:`Symfony\\Component\\HttpFoundation\\ParameterBag`;
+
 * ``files``: :class:`Symfony\\Component\\HttpFoundation\\FileBag`;
 
 * ``server``: :class:`Symfony\\Component\\HttpFoundation\\ServerBag`;
@@ -154,11 +158,14 @@ argument::
 $request->query->get('foo[bar]', null, true);
 // returns 'bar'
 
+.. _component-foundation-attributes:
+
 Last, but not the least, you can also store additional data in the request,
 thanks to the ``attributes`` public property, which is also an instance of
 :class:`Symfony\\Component\\HttpFoundation\\ParameterBag`. This is mostly used
 to attach information that belongs to the Request and that needs to be
-accessed from many different points in your application.
+accessed from many different points in your application. For information
+on how this is used in the Symfony2 framework, see :ref:`read more<book-fundamentals-attributes>`.
 
 Identifying a Request
 ~~~~~~~~~~~~~~~~~~~~~

@@ -148,7 +148,7 @@ mapping type:
 # app/config/config.yml
 doctrine:
 dbal:
-connection:
+connections:
 default:
 // Other connections parameters
 mapping_types:

@@ -106,7 +106,7 @@ we want to always render it in a ``ul`` element. In your form theme template
 
 .. code-block:: html+jinja
 
-{# src/Acme/DemoBundle/Resources/Form/fields.html.twig #}
+{# src/Acme/DemoBundle/Resources/views/Form/fields.html.twig #}
 
 {% block gender_widget %}
 {% spaceless %}

@@ -412,7 +412,7 @@ to the ``NewsletterManager`` class, the config would look like this:
 )->addMethodCall('setMailer', array(
 new Reference('my_alternative_mailer')
 ));
-$container->setDefinition('newsletter_manager', new DefinitionDecorator(
+$container->setDefinition('greeting_card_manager', new DefinitionDecorator(
 'mail_manager'
 ))->setClass(
 '%greeting_card_manager.class%'

@@ -10,7 +10,7 @@ Understanding Scopes
 --------------------
 
 The scope of a service controls how long an instance of a service is used
-by the container. the Dependency Injection component provides two generic
+by the container. The Dependency Injection component provides two generic
 scopes:
 
 - `container` (the default one): The same instance is used each time you

@@ -69,6 +69,32 @@ At this point, you have a fully-functional Symfony2 project that's correctly
 committed to git. You can immediately begin development, committing the new
 changes to your git repository.
 
+.. tip::
+
+After execution of the command:
+
+.. code-block:: bash
+
+$ php bin/vendors install
+
+ your project will contain complete the git history of all the bundles
+and libraries defined in the ``deps`` file. It can be as much as 100 MB!
+You can remove the git history directories with the following command:
+
+.. code-block:: bash
+
+$ find vendor -name .git -type d | xargs rm -rf
+
+ The command removes all ``.git`` directories contained inside the
+``vendor`` directory.
+
+If you want to update bundles defined in ``deps`` file after this, you
+will have to reinstall them:
+
+.. code-block:: bash
+
+$ php bin/vendors install --reinstall
+
 You can continue to follow along with the :doc:`/book/page_creation` chapter
 to learn more about how to configure and develop inside your application.
 

@@ -78,7 +78,7 @@ Field Options
 empty_value
 ~~~~~~~~~~~
 
-**type**: ``string``|``array``
+**type**: ``string`` or ``array``
 
 If your widget option is set to ``choice``, then this field will be represented
 as a series of ``select`` boxes. The ``empty_value`` option can be used to

@@ -19,9 +19,15 @@ data can be a ``DateTime`` object, a string, a timestamp or an array.
 | | - `time_widget`_ |
 | | - `input`_ |
 | | - `date_format`_ |
+| | - `hours`_ |
+| | - `minutes`_ |
+| | - `seconds`_ |
 | | - `years`_ |
 | | - `months`_ |
 | | - `days`_ |
+| | - `with_seconds`_ |
+| | - `data_timezone`_ |
+| | - `user_timezone`_ |
 +----------------------+-----------------------------------------------------------------------------+
 | Parent type | :doc:`form</reference/forms/types/form>` |
 +----------------------+-----------------------------------------------------------------------------+

@@ -11,7 +11,7 @@ have a protocol.
 +-------------+-------------------------------------------------------------------+
 | Rendered as | ``input url`` field |
 +-------------+-------------------------------------------------------------------+
-| Options | - ``default_protocol`` |
+| Options | - `default_protocol`_ |
 +-------------+-------------------------------------------------------------------+
 | Inherited | - `max_length`_ |
 | options | - `required`_ |