Jan 22, 2014 · Jan 9, 2014 · Jan 21, 2014
diff --git a/book/forms.rst b/book/forms.rst

 When your form contains more than one submit button, you will want to check
 which of the buttons was clicked to adapt the program flow in your controller.
 Let'sadd a second button with the caption "Save and add" toour form::
 To do this,add a second button with the caption "Save and add" toyour form::

    $form = $this->createFormBuilder($task)
        ->add('task', 'text')
 When your form contains multiple submit buttons, you can change the validation
 group depending on which button is used to submit the form. For example,
 consider a form in a wizard that lets you advance to the next step or go back
 to the previous step.Let's assumealsothat when returning to the previous
 step,the data of the form should be saved, but not validated.
 to the previous step.Also assume that when returning to the previous step,
 the data of the form should be saved, but not validated.

 First, we need to add the two buttons to the form::

diff --git a/book/from_flat_php_to_symfony2.rst b/book/from_flat_php_to_symfony2.rst
    tied to MySQL. Though not covered here, Symfony2 fully integrates `Doctrine`_,
    a library dedicated to database abstraction and mapping.

 Let's get to work on solving these problems and more.

 Isolating the Presentation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~

 ~~~~~~~~~~~~~~~~~~~~~~~

 In the upcoming chapters, you'll learn more about how each piece of Symfony
 works and the recommended organization of a project. For now,let's see how
 migrating the blog from flat PHP to Symfony2 has improved life:
 works and the recommended organization of a project. For now,have a look
 at howmigrating the blog from flat PHP to Symfony2 has improved life:

 * Your application now has **clear and consistently organized code** (though
  Symfony doesn't force you into this). This promotes **reusability** and
diff --git a/book/security.rst b/book/security.rst
 * All URLs *not* matching ``/admin/*`` are accessible by all users (and the
  user is never prompted to log in).

 Let's look briefly athow security works and how each part of the configuration
 comes into play.
 Read this short summary abouthow security works and how each part of the
 configurationcomes into play.

 How Security Works: Authentication and Authorization
 ----------------------------------------------------
 check the user's credentials and either authenticate the user or send the
 user back to the login form where the error can be displayed.

 Let's review the whole process:
 To review the whole process:

 #. The user tries to access a resource that is protected;
 #. The firewall initiates the authentication process by redirecting the
diff --git a/components/console/introduction.rst b/components/console/introduction.rst
    configured with an ANSI driver and your console commands invoke other scripts which
    emit ANSI color sequences, they will be shown as raw escape characters.

    To enable ANSIcolour support for Windows, please install `ANSICON`_.
    To enable ANSIcolor support for Windows, please install `ANSICON`_.

 Creating a basic Command
 ------------------------
diff --git a/components/filesystem.rst b/components/filesystem.rst
 Remove
 ~~~~~~

 :method:`Symfony\\Component\\Filesystem\\Filesystem::remove`let's you remove
 files,symlink, directories easily::
 :method:`Symfony\\Component\\Filesystem\\Filesystem::remove`is used to remove
 files,symlinks, directories easily::

    $fs->remove(array('symlink', '/path/to/directory', 'activity.log'));

diff --git a/components/http_foundation/session_configuration.rst b/components/http_foundation/session_configuration.rst

 This section deals with how to configure session management and fine tune it
 to your specific needs. This documentation covers save handlers, which
 store and retrieve session data, and configuring sessionbehaviour.
 store and retrieve session data, and configuring sessionbehavior.

 Save Handlers
 ~~~~~~~~~~~~~

    Native save handlers provide a quick solution to session storage, however, in complex systems
    where you need more control, custom save handlers may provide more freedom and flexibility.
    Symfony2 provides several implementations which you may furthercustomise as required.
    Symfony2 provides several implementations which you may furthercustomize as required.

 Custom Save Handlers
 --------------------
diff --git a/components/routing/introduction.rst b/components/routing/introduction.rst
 * A :class:`Symfony\\Component\\Routing\\RequestContext`, which has information about the request
 * A :class:`Symfony\\Component\\Routing\\Matcher\\UrlMatcher`, which performs the mapping of the request to a single route

 Let's see a quick example. Notice that this assumes that you've already configured
 Here is a quick example. Notice that this assumes that you've already configured
 your autoloader to load the Routing component::

    use Symfony\Component\Routing\Matcher\UrlMatcher;
diff --git a/components/serializer.rst b/components/serializer.rst
 Deserializing an Object
 -----------------------

 Let's seenow how to do theexactly the opposite. This time, the information
 You'llnowlearnhow to do theexact opposite. This time, the information
 of the ``Person`` class would be encoded in XML format::

    $data = <<<EOF
diff --git a/cookbook/assetic/apply_to_option.rst b/cookbook/assetic/apply_to_option.rst

 Assetic filters can be applied to individual files, groups of files or even,
 as you'll see here, files that have a specific extension. To show you how
 to handle each option,let'ssuppose that you want to use Assetic's CoffeeScript
 to handle each option, suppose that you want to use Assetic's CoffeeScript
 filter, which compiles CoffeeScript files into JavaScript.

 The main configuration is just the paths to coffee, node and node_modules.
diff --git a/cookbook/cache/varnish.rst b/cookbook/cache/varnish.rst

    sub vcl_recv {
        /*
        Varnish defaultbehaviour doesn't support PURGE.
        Varnish defaultbehavior doesn't support PURGE.
        Match the PURGE request and immediately do a cache lookup,
        otherwise Varnish will directly pipe the request to the backend
        and bypass the cache
diff --git a/cookbook/configuration/apache_router.rst b/cookbook/configuration/apache_router.rst
 Generating mod_rewrite rules
 ----------------------------

 To test that it's working,let'screate a very basic route for the AcmeDemoBundle:
 To test that it's working, create a very basic route for the AcmeDemoBundle:

 .. configuration-block::

diff --git a/cookbook/configuration/override_dir_structure.rst b/cookbook/configuration/override_dir_structure.rst
 .. caution::

    You should keep the ``cache`` directory different for each environment,
    otherwise some unexpectedbehaviour may happen. Each environment generates
    otherwise some unexpectedbehavior may happen. Each environment generates
    its own cached config files, and so each needs its own directory to store
    those cache files.

diff --git a/cookbook/deployment-tools.rst b/cookbook/deployment-tools.rst

 There are several ways you can deploy a Symfony2 application.

 Let's start with a few basic deployment strategies and build up from there.
 Start with a few basic deployment strategies and build up from there.

 Basic File Transfer
 ~~~~~~~~~~~~~~~~~~~
diff --git a/cookbook/doctrine/dbal.rst b/cookbook/doctrine/dbal.rst
 achieve this task, it needs to know which mapping type needs to be used
 for each database types. Registering new ones can be done through the configuration.

 Let's map the ENUM type (not supported by DBAL by default) to a the ``string``
 Now, map the ENUM type (not supported by DBAL by default) to the ``string``
 mapping type:

 .. configuration-block::
diff --git a/cookbook/doctrine/resolve_target_entity.rst b/cookbook/doctrine/resolve_target_entity.rst
 Set up
 ------

 Let's usethe following basic entities (which are incomplete for brevity)
 to explain how to set up and use theRTEL.
 This article usesthe followingtwobasic entities (which are incomplete for
 brevity)to explain how to set up and use the``ResolveTargetEntityListener``.

 A Customer entity::

     */
    class Customer extends BaseCustomer implements InvoiceSubjectInterface
    {
        // Inour example, any methods defined in the InvoiceSubjectInterface
        // Inthis example, any methods defined in the InvoiceSubjectInterface
        // are already implemented in the BaseCustomer
    }

diff --git a/cookbook/form/create_custom_field_type.rst b/cookbook/form/create_custom_field_type.rst

 In this case, since the parent field is ``choice``, you don't *need* to do
 any work as the custom field type will automatically be rendered like a ``choice``
 type. But for the sake of this example,let'ssuppose that when your field
 is "expanded"(i.e. radio buttons or checkboxes, instead of a select field),
 you want toalways render it in a ``ul`` element. In your form theme template
 (see abovelink for details), create a ``gender_widget`` block to handle this:
 type. But for the sake of this example, suppose that when your field is "expanded"
 (i.e. radio buttons or checkboxes, instead of a select field), you want to
 always render it in a ``ul`` element. In your form theme template (see above
 link for details), create a ``gender_widget`` block to handle this:

 .. configuration-block::

diff --git a/cookbook/form/create_form_type_extension.rst b/cookbook/form/create_form_type_extension.rst
 Defining the Form Type Extension
 --------------------------------

 Your first task will be to create the form type extension class. Let's
 call it ``ImageTypeExtension``. By standard, form extensions usually live
 in the ``Form\Extension``directory of one of your bundles.
 Your first task will be to create the form type extension class (called ``ImageTypeExtension``
 in this article). By standard, form extensions usually live in the ``Form\Extension``
 directory of one of your bundles.

 When creating a form type extension, you can either implement the
 :class:`Symfony\\Component\\Form\\FormTypeExtensionInterface` interface
 -----------------------------------

 The goal of your extension is to display nice images next to file inputs
 (when the underlying model contains images). For that purpose,let's assume
 thatyou use an approach similar to the one described in
 (when the underlying model contains images). For that purpose,suppose that
 you use an approach similar to the one described in
 :doc:`How to handle File Uploads with Doctrine </cookbook/doctrine/file_uploads>`:
 you have a Media model with a file property (corresponding to the file field
 in the form) and a path property (corresponding to the image path in the
diff --git a/cookbook/form/dynamic_form_modification.rst b/cookbook/form/dynamic_form_modification.rst
 Customizing your Form based on the underlying Data
 --------------------------------------------------

 Before jumping right into dynamic form generation,let's have a quick review
 of whata bare form class looks like::
 Before jumping right into dynamic form generation,hold on and recall what
 a bare form class looks like::

    // src/Acme/DemoBundle/Form/Type/ProductType.php
    namespace Acme\DemoBundle\Form\Type;

 Sometimes you want a form to be generated dynamically based not only on data
 from the form but also on something else - like some data from the current user.
 Suppose you have a social website where a user can only message people marked
 Suppose you have a social website where a user can only message people marked
 as friends on the website. In this case, a "choice list" of whom to message
 should only contain users that are the current user's friends.

diff --git a/cookbook/form/form_collections.rst b/cookbook/form/form_collections.rst
    including the ``ManyToMany`` association mapping definition on the Task's
    ``tags`` property.

 Let's start there:suppose that each ``Task`` belongs to multiple ``Tag``
 objects. Startby creating a simple ``Task`` class::
 First,suppose that each ``Task`` belongs to multiple ``Tag`` objects. Start
 by creating a simple ``Task`` class::

    // src/Acme/TaskBundle/Entity/Task.php
    namespace Acme\TaskBundle\Entity;
    The ``name`` property is public here, but it can just as easily be protected
    or private (but then it would need ``getName`` and ``setName`` methods).

 Now let's get to the forms. Create a form class so that a ``Tag`` object
 can be modified by the user::
 Then, create a form class so that a ``Tag`` object can be modified by the user::

    // src/Acme/TaskBundle/Form/Type/TagType.php
    namespace Acme\TaskBundle\Form\Type;
diff --git a/cookbook/form/inherit_data_option.rst b/cookbook/form/inherit_data_option.rst
 As you can see, each entity shares a few of the same fields: ``address``,
 ``zipcode``, ``city``, ``country``.

 Let's build two forms for these entities, ``CompanyType`` and ``CustomerType``::
 Start with building two forms for these entities, ``CompanyType`` and ``CustomerType``::

    // src/Acme/HelloBundle/Form/Type/CompanyType.php
    namespace Acme\HelloBundle\Form\Type;
    }

 Instead of including the duplicated fields ``address``, ``zipcode``, ``city``
 and ``country`` in both of these forms,we willcreate a third formfor that.
 We will call this form simply ``LocationType``::
 and ``country`` in both of these forms, create a third formcalled ``LocationType``
 for that::

    // src/Acme/HelloBundle/Form/Type/LocationType.php
    namespace Acme\HelloBundle\Form\Type;
    can also (just like with any option) pass it in the third argument of
    ``$builder->add()``.

 Let's make this work by adding the location form toour two original forms::
 Finally, make this work by adding the location form toyour two original forms::

    // src/Acme/HelloBundle/Form/Type/CompanyType.php
    public function buildForm(FormBuilderInterface $builder, array $options)
diff --git a/cookbook/form/unit_testing.rst b/cookbook/form/unit_testing.rst
        }
    }

 So, what does it test?Let's explain it line by line.
 So, what does it test?Here comes a detailed explanation.

 First you verify if the ``FormType`` compiles. This includes basic class
 inheritance, the ``buildForm`` function and options resolution. This should
diff --git a/cookbook/routing/custom_route_loader.rst b/cookbook/routing/custom_route_loader.rst
        return $collection;

 The important part here is the ``type`` key. Its value should be "extra".
 This is the type whichour ``ExtraLoader`` supports and this will make sure
 This is the type whichthe ``ExtraLoader`` supports and this will make sure
 its ``load()`` method gets called. The ``resource`` key is insignificant
 for the ``ExtraLoader``, sowe set it to ".".
 for the ``ExtraLoader``, soit is set to ".".

 .. note::

diff --git a/cookbook/security/acl.rst b/cookbook/security/acl.rst
 Getting Started
 ---------------

 Coming back to the small example from the beginning,let's implement ACL for
 it.
 Coming back to the small example from the beginning,you can now implement
 ACL forit.

 Creating an ACL, and adding an ACE
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/cookbook/security/acl_advanced.rst b/cookbook/security/acl_advanced.rst
  it only applies to one specific object.

 Sometimes, you will find the need to apply an ACE only to a specific field of
 the object.Let's say you want the ID only to be viewable by an administrator,
 the object.Suppose you want the ID only to be viewable by an administrator,
 but not by your customer service. To solve this common problem, two more sub-scopes
 have been added:

diff --git a/cookbook/security/custom_provider.rst b/cookbook/security/custom_provider.rst
 interface requires an :method:`Symfony\\Component\\Security\\Core\\User\\EquatableInterface::isEqualTo`
 method.

 Let's see this in action::
 This is how your ``WebserviceUser`` class looks in action::

    // src/Acme/WebserviceUserBundle/Security/User/WebserviceUser.php
    namespace Acme\WebserviceUserBundle\Security\User;
diff --git a/cookbook/service_container/scopes.rst b/cookbook/service_container/scopes.rst
 .. index::
   single: DependencyInjection; Scopes

 How towork with Scopes
 How toWork with Scopes
 =======================

 This entry is all about scopes, a somewhat advanced topic related to the

    Imagine, however, that you need the ``request`` service in your ``my_mailer``
    service, maybe because you're reading the URL of the current request.
    So, you add it as a constructor argument.Let's look at why this presents
    a problem:
    So, you add it as a constructor argument.There are several reasons why
 this presentsa problem:

    * When requesting ``my_mailer``, an instance of ``my_mailer`` (let's call
 it*MailerA*) is created and the ``request`` service (let's call it
 *RequestA*)is passed to it. Life is good!
    * When requesting ``my_mailer``, an instance of ``my_mailer`` (called
      *MailerA*) is created and the ``request`` service (called *RequestA*)
      is passed to it. Life is good!

    * You've now made a subrequest in Symfony, which is a fancy way of saying
      that you've called, for example, the ``{{ render(...) }}`` Twig function,
diff --git a/cookbook/symfony1.rst b/cookbook/symfony1.rst
 flexible. Additionally, while *your* bundles will live in the ``src/`` directory,
 third-party bundles will live somewhere in the ``vendor/`` directory.

 To get a better picture of the ``src/`` directory,let'sfirst think ofa
 symfony1 application. First, part of your code likely lives inside one or
 To get a better picture of the ``src/`` directory, first think ofthe structure
 of asymfony1 application. First, part of your code likely lives inside one or
 more applications. Most commonly these include modules, but could also include
 any other PHP classes you put in your application. You may have also created
 a ``schema.yml`` file in the ``config`` directory of your project and built
diff --git a/cookbook/templating/PHP.rst b/cookbook/templating/PHP.rst
 means that the controller element is empty, so the corresponding file is
 directly stored under ``views/``.

 Now,let'shave a look at the ``layout.html.php`` file:
 Now, have a look at the ``layout.html.php`` file:

 .. code-block:: html+php
Original file line number	Diff line number	Diff line change
Expand Up		@@ -281,7 +281,7 @@ Submitting Forms with Multiple Buttons

		When your form contains more than one submit button, you will want to check
		which of the buttons was clicked to adapt the program flow in your controller.
		Let'sadd a second button with the caption "Save and add" toour form::
		To do this,add a second button with the caption "Save and add" toyour form::

		$form = $this->createFormBuilder($task)
		->add('task', 'text')
Expand DownExpand Up		@@ -552,8 +552,8 @@ Groups based on the Clicked Button
		When your form contains multiple submit buttons, you can change the validation
		group depending on which button is used to submit the form. For example,
		consider a form in a wizard that lets you advance to the next step or go back
		to the previous step.Let's assumealsothat when returning to the previous
		step,the data of the form should be saved, but not validated.
		to the previous step.Also assume that when returning to the previous step,
		the data of the form should be saved, but not validated.

		First, we need to add the two buttons to the form::

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -75,8 +75,6 @@ to maintain. There are several problems that need to be addressed:
		tied to MySQL. Though not covered here, Symfony2 fully integrates `Doctrine`_,
		a library dedicated to database abstraction and mapping.

		Let's get to work on solving these problems and more.

		Isolating the Presentation
		~~~~~~~~~~~~~~~~~~~~~~~~~~

Expand DownExpand Up		@@ -673,8 +671,8 @@ Where Symfony2 Delivers
		~~~~~~~~~~~~~~~~~~~~~~~

		In the upcoming chapters, you'll learn more about how each piece of Symfony
		works and the recommended organization of a project. For now,let's see how
		migrating the blog from flat PHP to Symfony2 has improved life:
		works and the recommended organization of a project. For now,have a look
Copy link Member weaverryanJan 21, 2014 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. have a lookat
		at howmigrating the blog from flat PHP to Symfony2 has improved life:

		* Your application now has clear and consistently organized code (though
		Symfony doesn't force you into this). This promotes reusability and
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -148,8 +148,8 @@ that looks like the following:
		* All URLs not matching ``/admin/*`` are accessible by all users (and the
		user is never prompted to log in).

		Let's look briefly athow security works and how each part of the configuration
		comes into play.
		Read this short summary abouthow security works and how each part of the
		configurationcomes into play.

		How Security Works: Authentication and Authorization
		----------------------------------------------------
Expand DownExpand Up		@@ -541,7 +541,7 @@ And that's it! When you submit the form, the security system will automatically
		check the user's credentials and either authenticate the user or send the
		user back to the login form where the error can be displayed.

		Let's review the whole process:
		To review the whole process:

		#. The user tries to access a resource that is protected;
		#. The firewall initiates the authentication process by redirecting the
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,7 +27,7 @@ You can install the component in 2 different ways:
		configured with an ANSI driver and your console commands invoke other scripts which
		emit ANSI color sequences, they will be shown as raw escape characters.

		To enable ANSIcolour support for Windows, please install `ANSICON`_.
		To enable ANSIcolor support for Windows, please install `ANSICON`_.

		Creating a basic Command
		------------------------
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -162,8 +162,8 @@ the mode of a file. The fourth argument is a boolean recursive option::
		Remove
		~~~~~~

		:method:`Symfony\\Component\\Filesystem\\Filesystem::remove`let's you remove
		files,symlink, directories easily::
		:method:`Symfony\\Component\\Filesystem\\Filesystem::remove`is used to remove
		files,symlinks, directories easily::

		$fs->remove(array('symlink', '/path/to/directory', 'activity.log'));

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,7 +7,7 @@ Configuring Sessions and Save Handlers

		This section deals with how to configure session management and fine tune it
		to your specific needs. This documentation covers save handlers, which
		store and retrieve session data, and configuring sessionbehaviour.
		store and retrieve session data, and configuring sessionbehavior.

		Save Handlers
		~~~~~~~~~~~~~
Expand DownExpand Up		@@ -57,7 +57,7 @@ Example usage::

		Native save handlers provide a quick solution to session storage, however, in complex systems
		where you need more control, custom save handlers may provide more freedom and flexibility.
		Symfony2 provides several implementations which you may furthercustomise as required.
		Symfony2 provides several implementations which you may furthercustomize as required.

		Custom Save Handlers
		--------------------
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,7 +25,7 @@ In order to set up a basic routing system you need three parts:
		* A :class:`Symfony\\Component\\Routing\\RequestContext`, which has information about the request
		* A :class:`Symfony\\Component\\Routing\\Matcher\\UrlMatcher`, which performs the mapping of the request to a single route

		Let's see a quick example. Notice that this assumes that you've already configured
		Here is a quick example. Notice that this assumes that you've already configured
		your autoloader to load the Routing component::

		use Symfony\Component\Routing\Matcher\UrlMatcher;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -129,7 +129,7 @@ method on the normalizer definition::
		Deserializing an Object
		-----------------------

		Let's seenow how to do theexactly the opposite. This time, the information
		You'llnowlearnhow to do theexact opposite. This time, the information
		of the ``Person`` class would be encoded in XML format::

		$data = <<<EOF
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,7 @@ How to Apply an Assetic Filter to a Specific File Extension

		Assetic filters can be applied to individual files, groups of files or even,
		as you'll see here, files that have a specific extension. To show you how
		to handle each option,let'ssuppose that you want to use Assetic's CoffeeScript
		to handle each option, suppose that you want to use Assetic's CoffeeScript
		filter, which compiles CoffeeScript files into JavaScript.

		The main configuration is just the paths to coffee, node and node_modules.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -90,7 +90,7 @@ that will invalidate the cache for a given resource:

		sub vcl_recv {
		/*
		Varnish defaultbehaviour doesn't support PURGE.
		Varnish defaultbehavior doesn't support PURGE.
		Match the PURGE request and immediately do a cache lookup,
		otherwise Varnish will directly pipe the request to the backend
		and bypass the cache
Expand Down