Jan 3, 2013 · Jan 3, 2013 · Jan 3, 2013 · Jan 5, 2013 · Jan 6, 2013 · Jan 6, 2013
diff --git a/book/_security-2012-6431.rst.inc b/book/_security-2012-6431.rst.inc
diff --git a/book/controller.rst b/book/controller.rst
 -----------------------------

 The new controller returns a simple HTML page. To actually view this page
 in your browser, you need to create a route, which maps a specific URLpattern
 in your browser, you need to create a route, which maps a specific URLpath
 to the controller:

 .. configuration-block::

        # app/config/routing.yml
        hello:
 pattern:      /hello/{name}
            defaults:{ _controller: AcmeHelloBundle:Hello:index }
 path:      /hello/{name}
            defaults:  { _controller: AcmeHelloBundle:Hello:index }

    .. code-block:: xml

        <!-- app/config/routing.xml -->
        <route id="hello"pattern="/hello/{name}">
        <route id="hello"path="/hello/{name}">
            <default key="_controller">AcmeHelloBundle:Hello:index</default>
        </route>


        # app/config/routing.yml
        hello:
 pattern:      /hello/{first_name}/{last_name}
            defaults:{ _controller: AcmeHelloBundle:Hello:index, color: green }
 path:      /hello/{first_name}/{last_name}
            defaults:  { _controller: AcmeHelloBundle:Hello:index, color: green }

    .. code-block:: xml

        <!-- app/config/routing.xml -->
        <route id="hello"pattern="/hello/{first_name}/{last_name}">
        <route id="hello"path="/hello/{first_name}/{last_name}">
            <default key="_controller">AcmeHelloBundle:Hello:index</default>
            <default key="color">green</default>
        </route>
    {
        $form = $this->createForm(...);

        $form->bindRequest($request);
        $form->bind($request);
        // ...
    }

    // in another controller for another request
    $foo = $session->get('foo');

    //settheuser locale
    $session->setLocale('fr');
    //use a default value ifthekey doesn't exist
    $filters = $session->get('filters', array());

 These attributes will remain on the user for the remainder of that user's
 session.
    {
        $form = $this->createForm(...);

        $form->bindRequest($this->getRequest());
        $form->bind($this->getRequest());
        if ($form->isValid()) {
            // do some sort of processing

            $this->get('session')->setFlash(
                'notice',
                'Your changes were saved!'
            );
            $this->get('session')->getFlashBag()->add('notice', 'Your changes were saved!');

            return $this->redirect($this->generateUrl(...));
        }

    .. code-block:: html+jinja

        {%ifapp.session.hasFlash('notice') %}
        {%for flashMessage inapp.session.flashbag.get('notice') %}
            <div class="flash-notice">
                {{app.session.flash('notice') }}
                {{flashMessage }}
            </div>
        {%endif %}
        {%endfor %}

    .. code-block:: html+php

        <?phpif ($view['session']->hasFlash('notice')): ?>
        <?phpforeach ($view['session']->getFlashBag()->get('notice') as $message): ?>
            <div class="flash-notice">
                <?php echo$view['session']->getFlash('notice') ?>
                <?php echo"<div class='flash-error'>$message</div>" ?>
            </div>
        <?phpendif; ?>
        <?phpendforeach; ?>

 By design, flash messages are meant to live for exactly one request (they're
 "gone in a flash"). They're designed to be used across redirects exactly as
    header names are normalized so that using ``Content-Type`` is equivalent
    to ``content-type`` or even ``content_type``.

 .. tip::

    There is also a special :class:`Symfony\\Component\\HttpFoundation\\JsonResponse`
    class that helps return JSON responses. See :ref:`component-http-foundation-json-response`.

 .. index::
   single: Controller; Request object

diff --git a/book/doctrine.rst b/book/doctrine.rst

 Before you really begin, you'll need to configure your database connection
 information. By convention, this information is usually configured in an
 ``app/config/parameters.ini`` file:
 ``app/config/parameters.yml`` file:

 .. code-block::ini
 .. code-block::yaml

    ; app/config/parameters.ini
    [parameters]
    database_driver   = pdo_mysql
    database_host     = localhost
    database_name     = test_project
    database_user     = root
    database_password = password
    # app/config/parameters.yml
    parameters:
        database_driver:    pdo_mysql
        database_host:      localhost
        database_name:      test_project
        database_user:      root
        database_password:  password

    # ...

 .. note::

    Defining the configuration via ``parameters.ini`` is just a convention.
    Defining the configuration via ``parameters.yml`` is just a convention.
    The parameters defined in that file are referenced by the main configuration
    file when setting up Doctrine:

        $product->setPrice('19.99');
        $product->setDescription('Lorem ipsum dolor');

        $em = $this->getDoctrine()->getEntityManager();
        $em = $this->getDoctrine()->getManager();
        $em->persist($product);
        $em->flush();


    public function updateAction($id)
    {
        $em = $this->getDoctrine()->getEntityManager();
        $em = $this->getDoctrine()->getManager();
        $product = $em->getRepository('AcmeStoreBundle:Product')->find($id);

        if (!$product) {
 cost more than ``19.99``, ordered from cheapest to most expensive. From inside
 a controller, do the following::

    $em = $this->getDoctrine()->getEntityManager();
    $em = $this->getDoctrine()->getManager();
    $query = $em->createQuery(
        'SELECT p FROM AcmeStoreBundle:Product p WHERE p.price > :price ORDER BY p.price ASC'
    )->setParameter('price', '19.99');

 You can use this new method just like the default finder methods of the repository::

    $em = $this->getDoctrine()->getEntityManager();
    $em = $this->getDoctrine()->getManager();
    $products = $em->getRepository('AcmeStoreBundle:Product')
                ->findAllOrderedByName();

            // relate this product to the category
            $product->setCategory($category);

            $em = $this->getDoctrine()->getEntityManager();
            $em = $this->getDoctrine()->getManager();
            $em->persist($category);
            $em->persist($product);
            $em->flush();

  .. code-block:: bash

      $ php app/console doctrine:ensure-production-settings --no-debug --env=prod

  .. caution::

      Don't forget to add the ``--no-debug`` switch, because the debug flag is
      always set to true, even if the environment is set to ``prod``.
      $ php app/console doctrine:ensure-production-settings --env=prod

 * ``doctrine:mapping:import`` - allows Doctrine to introspect an existing
  database and create mapping information. For more information, see

 .. _`Doctrine`: http://www.doctrine-project.org/
 .. _`MongoDB`: http://www.mongodb.org/
 .. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html
 .. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/query-builder.html
 .. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/dql-doctrine-query-language.html
 .. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/association-mapping.html
 .. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html
 .. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/query-builder.html
 .. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/dql-doctrine-query-language.html
 .. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/association-mapping.html
 .. _`DateTime`: http://php.net/manual/en/class.datetime.php
 .. _`Mapping Types Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#doctrine-mapping-types
 .. _`Property Mapping documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#property-mapping
 .. _`Lifecycle Events documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/events.html#lifecycle-events
 .. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#quoting-reserved-words
 .. _`Persistent classes`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#persistent-classes
 .. _`Property Mapping`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#property-mapping
 .. _`Mapping Types Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#doctrine-mapping-types
 .. _`Property Mapping documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#property-mapping
 .. _`Lifecycle Events documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html#lifecycle-events
 .. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#quoting-reserved-words
 .. _`Persistent classes`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#persistent-classes
 .. _`Property Mapping`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#property-mapping
Original file line number	Diff line number	Diff line change
Expand Up		@@ -141,7 +141,7 @@ Mapping a URL to a Controller
		-----------------------------

		The new controller returns a simple HTML page. To actually view this page
		in your browser, you need to create a route, which maps a specific URLpattern
		in your browser, you need to create a route, which maps a specific URLpath
		to the controller:

		.. configuration-block::
Expand All		@@ -150,13 +150,13 @@ to the controller:

		# app/config/routing.yml
		hello:
		pattern: /hello/{name}
		defaults:{ _controller: AcmeHelloBundle:Hello:index }
		path: /hello/{name}
		defaults: { _controller: AcmeHelloBundle:Hello:index }

		.. code-block:: xml

		<!-- app/config/routing.xml -->
		<route id="hello"pattern="/hello/{name}">
		<route id="hello"path="/hello/{name}">
		<default key="_controller">AcmeHelloBundle:Hello:index</default>
		</route>

Expand DownExpand Up		@@ -229,13 +229,13 @@ example:

		# app/config/routing.yml
		hello:
		pattern: /hello/{first_name}/{last_name}
		defaults:{ _controller: AcmeHelloBundle:Hello:index, color: green }
		path: /hello/{first_name}/{last_name}
		defaults: { _controller: AcmeHelloBundle:Hello:index, color: green }

		.. code-block:: xml

		<!-- app/config/routing.xml -->
		<route id="hello"pattern="/hello/{first_name}/{last_name}">
		<route id="hello"path="/hello/{first_name}/{last_name}">
		<default key="_controller">AcmeHelloBundle:Hello:index</default>
		<default key="color">green</default>
		</route>
Expand DownExpand Up		@@ -325,7 +325,7 @@ working with forms, for example::
		{
		$form = $this->createForm(...);

		$form->bindRequest($request);
		$form->bind($request);
		// ...
		}

Expand DownExpand Up		@@ -632,8 +632,8 @@ from any controller::
		// in another controller for another request
		$foo = $session->get('foo');

		//settheuser locale
		$session->setLocale('fr');
		//use a default value ifthekey doesn't exist
		$filters = $session->get('filters', array());

		These attributes will remain on the user for the remainder of that user's
		session.
Expand All		@@ -655,14 +655,11 @@ For example, imagine you're processing a form submit::
		{
		$form = $this->createForm(...);

		$form->bindRequest($this->getRequest());
		$form->bind($this->getRequest());
		if ($form->isValid()) {
		// do some sort of processing

		$this->get('session')->setFlash(
		'notice',
		'Your changes were saved!'
		);
		$this->get('session')->getFlashBag()->add('notice', 'Your changes were saved!');

		return $this->redirect($this->generateUrl(...));
		}
Expand All		@@ -681,19 +678,19 @@ the ``notice`` message:

		.. code-block:: html+jinja

		{%ifapp.session.hasFlash('notice') %}
		{%for flashMessage inapp.session.flashbag.get('notice') %}
		<div class="flash-notice">
		{{app.session.flash('notice') }}
		{{flashMessage }}
		</div>
		{%endif %}
		{%endfor %}

		.. code-block:: html+php

		<?phpif ($view['session']->hasFlash('notice')): ?>
		<?phpforeach ($view['session']->getFlashBag()->get('notice') as $message): ?>
		<div class="flash-notice">
		<?php echo$view['session']->getFlash('notice') ?>
		<?php echo"<div class='flash-error'>$message</div>" ?>
		</div>
		<?phpendif; ?>
		<?phpendforeach; ?>

		By design, flash messages are meant to live for exactly one request (they're
		"gone in a flash"). They're designed to be used across redirects exactly as
Expand DownExpand Up		@@ -727,6 +724,11 @@ headers and content that's sent back to the client::
		header names are normalized so that using ``Content-Type`` is equivalent
		to ``content-type`` or even ``content_type``.

		.. tip::

		There is also a special :class:`Symfony\\Component\\HttpFoundation\\JsonResponse`
		class that helps return JSON responses. See :ref:`component-http-foundation-json-response`.

		.. index::
		single: Controller; Request object

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,21 +44,23 @@ Configuring the Database

		Before you really begin, you'll need to configure your database connection
		information. By convention, this information is usually configured in an
		``app/config/parameters.ini`` file:
		``app/config/parameters.yml`` file:

		.. code-block::ini
		.. code-block::yaml

		; app/config/parameters.ini
		[parameters]
		database_driver = pdo_mysql
		database_host = localhost
		database_name = test_project
		database_user = root
		database_password = password
		# app/config/parameters.yml
		parameters:
		database_driver: pdo_mysql
		database_host: localhost
		database_name: test_project
		database_user: root
		database_password: password

		# ...

		.. note::

		Defining the configuration via ``parameters.ini`` is just a convention.
		Defining the configuration via ``parameters.yml`` is just a convention.
		The parameters defined in that file are referenced by the main configuration
		file when setting up Doctrine:

Expand DownExpand Up		@@ -479,7 +481,7 @@ of the bundle:
		$product->setPrice('19.99');
		$product->setDescription('Lorem ipsum dolor');

		$em = $this->getDoctrine()->getEntityManager();
		$em = $this->getDoctrine()->getManager();
		$em->persist($product);
		$em->flush();

Expand DownExpand Up		@@ -626,7 +628,7 @@ you have a route that maps a product id to an update action in a controller::

		public function updateAction($id)
		{
		$em = $this->getDoctrine()->getEntityManager();
		$em = $this->getDoctrine()->getManager();
		$product = $em->getRepository('AcmeStoreBundle:Product')->find($id);

		if (!$product) {
Expand DownExpand Up		@@ -692,7 +694,7 @@ Imagine that you want to query for products, but only return products that
		cost more than ``19.99``, ordered from cheapest to most expensive. From inside
		a controller, do the following::

		$em = $this->getDoctrine()->getEntityManager();
		$em = $this->getDoctrine()->getManager();
		$query = $em->createQuery(
		'SELECT p FROM AcmeStoreBundle:Product p WHERE p.price > :price ORDER BY p.price ASC'
		)->setParameter('price', '19.99');
Expand DownExpand Up		@@ -868,7 +870,7 @@ ordered alphabetically.

		You can use this new method just like the default finder methods of the repository::

		$em = $this->getDoctrine()->getEntityManager();
		$em = $this->getDoctrine()->getManager();
		$products = $em->getRepository('AcmeStoreBundle:Product')
		->findAllOrderedByName();

Expand DownExpand Up		@@ -1101,7 +1103,7 @@ Now you can see this new code in action! Imagine you're inside a controller::
		// relate this product to the category
		$product->setCategory($category);

		$em = $this->getDoctrine()->getEntityManager();
		$em = $this->getDoctrine()->getManager();
		$em->persist($category);
		$em->persist($product);
		$em->flush();
Expand DownExpand Up		@@ -1507,12 +1509,7 @@ Some notable or interesting tasks include:

		.. code-block:: bash

		$ php app/console doctrine:ensure-production-settings --no-debug --env=prod

		.. caution::

		Don't forget to add the ``--no-debug`` switch, because the debug flag is
		always set to true, even if the environment is set to ``prod``.
		$ php app/console doctrine:ensure-production-settings --env=prod

		* ``doctrine:mapping:import`` - allows Doctrine to introspect an existing
		database and create mapping information. For more information, see
Expand DownExpand Up		@@ -1563,14 +1560,14 @@ For more information about Doctrine, see the Doctrine section of the

		.. _`Doctrine`: http://www.doctrine-project.org/
		.. _`MongoDB`: http://www.mongodb.org/
		.. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html
		.. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/query-builder.html
		.. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/dql-doctrine-query-language.html
		.. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/association-mapping.html
		.. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html
		.. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/query-builder.html
		.. _`Doctrine Query Language`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/dql-doctrine-query-language.html
		.. _`Association Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/association-mapping.html
		.. _`DateTime`: http://php.net/manual/en/class.datetime.php
		.. _`Mapping Types Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#doctrine-mapping-types
		.. _`Property Mapping documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#property-mapping
		.. _`Lifecycle Events documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/events.html#lifecycle-events
		.. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#quoting-reserved-words
		.. _`Persistent classes`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#persistent-classes
		.. _`Property Mapping`: http://docs.doctrine-project.org/projects/doctrine-orm/en/2.1/reference/basic-mapping.html#property-mapping
		.. _`Mapping Types Documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#doctrine-mapping-types
		.. _`Property Mapping documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#property-mapping
		.. _`Lifecycle Events documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/events.html#lifecycle-events
		.. _`Reserved SQL keywords documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#quoting-reserved-words
		.. _`Persistent classes`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#persistent-classes
		.. _`Property Mapping`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html#property-mapping