Mar 1, 2015 · Mar 2, 2015 · Mar 2, 2015 · Mar 2, 2015 · Mar 13, 2015 · Mar 14, 2015
diff --git a/best_practices/business-logic.rst b/best_practices/business-logic.rst
    │  └─ AppBundle/
    │     └─ Utils/
    │        └─ MyClass.php
    ├─ tests/
    ├─ var/
    ├─ vendor/
    └─ web/

    │  │   └─ Utils/
    │  │      └─ MyClass.php
    │  └─ AppBundle/
    ├─ tests/
    ├─ var/
    ├─ vendor/
    └─ web/


 .. code-block:: bash

    $ phpapp/console doctrine:fixtures:load
    $ phpbin/console doctrine:fixtures:load

    Careful, database will be purged. Do you want to continue Y/N ? Y
      > purging database
diff --git a/best_practices/creating-the-project.rst b/best_practices/creating-the-project.rst

 .. code-block:: bash

    # Linux, Mac OS X
    $ cd projects/
    $ symfony new blog


    blog/
    ├─ app/
    │  ├─ console
    │  ├─ cache/
    │  ├─ config/
    │  ├─ logs/
    │  └─ Resources/
    ├─ bin
    │  └─ console
    ├─ src/
    │  └─ AppBundle/
    ├─ var/
    │  ├─ cache/
    │  ├─ logs/
    │  └─ sessions/
    ├─ tests/
    │  └─ AppBundle/
    ├─ vendor/
    └─ web/

 This file and directory hierarchy is the convention proposed by Symfony to
 structure your applications. The recommended purpose of each directory is the
 following:

 * ``app/cache/``, stores all the cache files generated by the application;
 * ``app/config/``, stores all the configuration defined for any environment;
 * ``app/logs/``, stores all the log files generated by the application;
 * ``app/Resources/``, stores all the templates and the translation files for the
  application;
 * ``src/AppBundle/``, stores the Symfony specific code (controllers and routes),
  your domain code (e.g. Doctrine classes) and all your business logic;
 * ``var/cache/``, stores all the cache files generated by the application;
 * ``var/logs/``, stores all the log files generated by the application;
 * ``var/sessions/``, stores all the session files generated by the application;
 * ``tests/AppBundle/``, stores the automatic tests (e.g. Unit tests) of the
  application.
 * ``vendor/``, this is the directory where Composer installs the application's
  dependencies and you should never modify any of its contents;
 * ``web/``, stores all the front controller files and all the web assets, such

    blog/
    ├─ app/
    │  ├─ console
    │  ├─ cache/
    │  ├─ config/
    │  ├─ logs/
    │  └─ Resources/
    ├─ bin/
    │  └─ console
    ├─ src/
    │  └─ AppBundle/
    ├─ tests/
    │  └─ AppBundle/
    ├─ var/
    │  ├─ cache/
    │  ├─ logs/
       └─ sessions/
    ├─ vendor/
    └─ web/
       ├─ app.php

    .. code-block:: bash

        $ phpapp/console generate:bundle --namespace=AppBundle --dir=src --format=annotation --no-interaction
        $ phpbin/console generate:bundle --namespace=AppBundle --dir=src --format=annotation --no-interaction

 Extending the Directory Structure
 ---------------------------------
 :doc:`override the location of the main directories </cookbook/configuration/override_dir_structure>`:
 ``cache/``, ``logs/`` and ``web/``.

 In addition, Symfony3 will use a slightly different directory structure when
 it's released:

 .. code-block:: text

    blog-symfony3/
    ├─ app/
    │  ├─ config/
    │  └─ Resources/
    ├─ bin/
    │  └─ console
    ├─ src/
    ├─ var/
    │  ├─ cache/
    │  └─ logs/
    ├─ vendor/
    └─ web/

 The changes are pretty superficial, but for now, we recommend that you use
 the Symfony directory structure.

 .. _`Composer`: https://getcomposer.org/
 .. _`Get Started`: https://getcomposer.org/doc/00-intro.md
 .. _`Composer download page`: https://getcomposer.org/download/
diff --git a/best_practices/introduction.rst b/best_practices/introduction.rst

 .. code-block:: bash

    # Linux and Mac OS X
    $ symfony demo

    # Windows
    c:\> php symfony demo

 **The demo application is a simple blog engine**, because that will allow us to
 focus on the Symfony concepts and features without getting buried in difficult
 implementation details. Instead of developing the application step by step in
diff --git a/best_practices/tests.rst b/best_practices/tests.rst

 .. code-block:: php

    //src/AppBundle/Tests/ApplicationAvailabilityFunctionalTest.php
    namespaceAppBundle\Tests;
    //tests/AppBundle/ApplicationAvailabilityFunctionalTest.php
    namespace Tests\AppBundle;

    use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;

diff --git a/book/bundles.rst b/book/bundles.rst
    {
        $bundles = array(
            // ...

            // register your bundle
            new Acme\TestBundle\AcmeTestBundle(),
        );

 .. code-block:: bash

    $ phpapp/console generate:bundle --namespace=Acme/TestBundle
    $ phpbin/console generate:bundle --namespace=Acme/TestBundle

 The bundle skeleton generates a basic controller, template and routing
 resource that can be customized. You'll learn more about Symfony's command-line
diff --git a/book/configuration.rst b/book/configuration.rst

 .. code-block:: bash

    $app/console config:dump-reference FrameworkBundle
    $php bin/console config:dump-reference FrameworkBundle

 The extension alias (configuration key) can also be used:

 .. code-block:: bash

    $app/console config:dump-reference framework
    $php bin/console config:dump-reference framework

 .. note::


 .. code-block:: bash

    $ phpapp/console cache:clear --env=prod --no-debug
    $ phpbin/console cache:clear --env=prod --no-debug

 .. note::

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

 .. code-block:: bash

    $ phpapp/console debug:container
    $ phpbin/console debug:container

 .. versionadded:: 2.6
    Prior to Symfony 2.6, this command was called ``container:debug``.
diff --git a/book/doctrine.rst b/book/doctrine.rst

 .. code-block:: bash

    $ phpapp/console doctrine:database:create
    $ phpbin/console doctrine:database:create

 .. sidebar:: Setting up the Database to be UTF8


    .. code-block:: bash

        $ phpapp/console doctrine:database:drop --force
        $ phpapp/console doctrine:database:create
        $ phpbin/console doctrine:database:drop --force
        $ phpbin/console doctrine:database:create

    There's no way to configure these defaults inside Doctrine, as it tries to be
    as agnostic as possible in terms of environment configuration. One way to solve

    .. code-block:: bash

        $ phpapp/console doctrine:generate:entity
        $ phpbin/console doctrine:generate:entity

 .. index::
    single: Doctrine; Adding mapping metadata

 .. code-block:: bash

    $ phpapp/console doctrine:generate:entities AppBundle/Entity/Product
    $ phpbin/console doctrine:generate:entities AppBundle/Entity/Product

 This command makes sure that all the getters and setters are generated
 for the ``Product`` class. This is a safe command - you can run it over and
 .. code-block:: bash

    # generates all entities in the AppBundle
    $ phpapp/console doctrine:generate:entities AppBundle
    $ phpbin/console doctrine:generate:entities AppBundle

    # generates all entities of bundles in the Acme namespace
    $ phpapp/console doctrine:generate:entities Acme
    $ phpbin/console doctrine:generate:entities Acme

 .. note::


 .. code-block:: bash

    $ phpapp/console doctrine:schema:update --force
    $ phpbin/console doctrine:schema:update --force

 .. tip::


 .. code-block:: bash

    $ phpapp/console doctrine:generate:entities AppBundle
    $ phpbin/console doctrine:generate:entities AppBundle

 Next, add a new method - ``findAllOrderedByName()`` - to the newly generated
 repository class. This method will query for all the ``Product`` entities,

 .. code-block:: bash

    $ phpapp/console doctrine:generate:entity --no-interaction \
    $ phpbin/console doctrine:generate:entity --no-interaction \
        --entity="AppBundle:Category" \
        --fields="name:string(255)"


 .. code-block:: bash

    $ phpapp/console doctrine:generate:entities AppBundle
    $ phpbin/console doctrine:generate:entities AppBundle

 Ignore the Doctrine metadata for a moment. You now have two classes - ``Category``
 and ``Product`` with a natural one-to-many relationship. The ``Category``

 .. code-block:: bash

    $ phpapp/console doctrine:schema:update --force
    $ phpbin/console doctrine:schema:update --force

 .. note::

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

            $form = $this->createFormBuilder($task)
                ->add('task', TextType::class)
                // If you use PHP 5.3 or 5.4 you must use
                // ->add('task', 'Symfony\Component\Form\Extension\Core\Type\TextType')
                ->add('dueDate', DateType::class)
                ->add('save', SubmitType::class, array('label' => 'Create Task'))
                ->getForm();
diff --git a/book/http_cache.rst b/book/http_cache.rst
 kernel::

    // web/app.php
    require_once __DIR__.'/../app/bootstrap.php.cache';
    require_once __DIR__.'/../app/AppKernel.php';
    require_once __DIR__.'/../app/AppCache.php';

    use Symfony\Component\HttpFoundation\Request;

    // ...
    $kernel = new AppKernel('prod', false);
    $kernel->loadClassCache();
    // wrap the default AppKernel with the AppCache one
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,6 +21,8 @@ Inside here, you can create whatever directories you want to organize things:
		│ └─ AppBundle/
		│ └─ Utils/
		│ └─ MyClass.php
		├─ tests/
		├─ var/
		├─ vendor/
		└─ web/

Expand All		@@ -40,6 +42,8 @@ and put things there:
		│ │ └─ Utils/
		│ │ └─ MyClass.php
		│ └─ AppBundle/
		├─ tests/
		├─ var/
		├─ vendor/
		└─ web/

Expand DownExpand Up		@@ -318,7 +322,7 @@ command:

		.. code-block:: bash

		$ phpapp/console doctrine:fixtures:load
		$ phpbin/console doctrine:fixtures:load

		Careful, database will be purged. Do you want to continue Y/N ? Y
		> purging database
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,7 +27,6 @@ to create files and execute the following commands:

		.. code-block:: bash

		# Linux, Mac OS X
		$ cd projects/
		$ symfony new blog

Expand DownExpand Up		@@ -63,27 +62,35 @@ number of files and directories generated automatically:

		blog/
		├─ app/
		│ ├─ console
		│ ├─ cache/
		│ ├─ config/
		│ ├─ logs/
		│ └─ Resources/
		├─ bin
		│ └─ console
		├─ src/
		│ └─ AppBundle/
		├─ var/
		│ ├─ cache/
		│ ├─ logs/
		│ └─ sessions/
		├─ tests/
		│ └─ AppBundle/
		├─ vendor/
		└─ web/

		This file and directory hierarchy is the convention proposed by Symfony to
		structure your applications. The recommended purpose of each directory is the
		following:

		* ``app/cache/``, stores all the cache files generated by the application;
		* ``app/config/``, stores all the configuration defined for any environment;
		* ``app/logs/``, stores all the log files generated by the application;
		* ``app/Resources/``, stores all the templates and the translation files for the
		application;
		* ``src/AppBundle/``, stores the Symfony specific code (controllers and routes),
		your domain code (e.g. Doctrine classes) and all your business logic;
		* ``var/cache/``, stores all the cache files generated by the application;
		* ``var/logs/``, stores all the log files generated by the application;
		* ``var/sessions/``, stores all the session files generated by the application;
		* ``tests/AppBundle/``, stores the automatic tests (e.g. Unit tests) of the
		application.
		* ``vendor/``, this is the directory where Composer installs the application's
		dependencies and you should never modify any of its contents;
		* ``web/``, stores all the front controller files and all the web assets, such
Expand DownExpand Up		@@ -128,13 +135,18 @@ that follows these best practices:

		blog/
		├─ app/
		│ ├─ console
		│ ├─ cache/
		│ ├─ config/
		│ ├─ logs/
		│ └─ Resources/
		├─ bin/
		│ └─ console
		├─ src/
		│ └─ AppBundle/
		├─ tests/
		│ └─ AppBundle/
		├─ var/
		│ ├─ cache/
		│ ├─ logs/
		└─ sessions/
		├─ vendor/
		└─ web/
		├─ app.php
Expand All		@@ -147,7 +159,7 @@ that follows these best practices:

		.. code-block:: bash

		$ phpapp/console generate:bundle --namespace=AppBundle --dir=src --format=annotation --no-interaction
		$ phpbin/console generate:bundle --namespace=AppBundle --dir=src --format=annotation --no-interaction

		Extending the Directory Structure
		---------------------------------
Expand All		@@ -157,27 +169,6 @@ structure of Symfony, you can
		:doc:`override the location of the main directories </cookbook/configuration/override_dir_structure>`:
		``cache/``, ``logs/`` and ``web/``.

		In addition, Symfony3 will use a slightly different directory structure when
		it's released:

		.. code-block:: text

		blog-symfony3/
		├─ app/
		│ ├─ config/
		│ └─ Resources/
		├─ bin/
		│ └─ console
		├─ src/
		├─ var/
		│ ├─ cache/
		│ └─ logs/
		├─ vendor/
		└─ web/

		The changes are pretty superficial, but for now, we recommend that you use
		the Symfony directory structure.

		.. _`Composer`: https://getcomposer.org/
		.. _`Get Started`: https://getcomposer.org/doc/00-intro.md
		.. _`Composer download page`: https://getcomposer.org/download/
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -76,12 +76,8 @@ installer and then execute this command to download the demo application:

		.. code-block:: bash

		# Linux and Mac OS X
		$ symfony demo

		# Windows
		c:\> php symfony demo

		The demo application is a simple blog engine, because that will allow us to
		focus on the Symfony concepts and features without getting buried in difficult
		implementation details. Instead of developing the application step by step in
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -30,8 +30,8 @@ A functional test can be as easy as this:

		.. code-block:: php

		//src/AppBundle/Tests/ApplicationAvailabilityFunctionalTest.php
		namespaceAppBundle\Tests;
		//tests/AppBundle/ApplicationAvailabilityFunctionalTest.php
		namespace Tests\AppBundle;

		use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -107,6 +107,7 @@ Now that you've created the bundle, enable it via the ``AppKernel`` class::
		{
		$bundles = array(
		// ...

		// register your bundle
		new Acme\TestBundle\AcmeTestBundle(),
		);
Expand All		@@ -122,7 +123,7 @@ generating a basic bundle skeleton:

		.. code-block:: bash

		$ phpapp/console generate:bundle --namespace=Acme/TestBundle
		$ phpbin/console generate:bundle --namespace=Acme/TestBundle

		The bundle skeleton generates a basic controller, template and routing
		resource that can be customized. You'll learn more about Symfony's command-line
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -122,13 +122,13 @@ FrameworkBundle configuration:

		.. code-block:: bash

		$app/console config:dump-reference FrameworkBundle
		$php bin/console config:dump-reference FrameworkBundle

		The extension alias (configuration key) can also be used:

		.. code-block:: bash

		$app/console config:dump-reference framework
		$php bin/console config:dump-reference framework

		.. note::

Expand DownExpand Up		@@ -177,7 +177,7 @@ cached files and allow them to rebuild:

		.. code-block:: bash

		$ phpapp/console cache:clear --env=prod --no-debug
		$ phpbin/console cache:clear --env=prod --no-debug

		.. note::

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -534,7 +534,7 @@ console command:

		.. code-block:: bash

		$ phpapp/console debug:container
		$ phpbin/console debug:container

		.. versionadded:: 2.6
		Prior to Symfony 2.6, this command was called ``container:debug``.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -116,7 +116,7 @@ for you:

		.. code-block:: bash

		$ phpapp/console doctrine:database:create
		$ phpbin/console doctrine:database:create

		.. sidebar:: Setting up the Database to be UTF8

Expand All		@@ -128,8 +128,8 @@ for you:

		.. code-block:: bash

		$ phpapp/console doctrine:database:drop --force
		$ phpapp/console doctrine:database:create
		$ phpbin/console doctrine:database:drop --force
		$ phpbin/console doctrine:database:create

		There's no way to configure these defaults inside Doctrine, as it tries to be
		as agnostic as possible in terms of environment configuration. One way to solve
Expand DownExpand Up		@@ -227,7 +227,7 @@ just a simple PHP class.

		.. code-block:: bash

		$ phpapp/console doctrine:generate:entity
		$ phpbin/console doctrine:generate:entity

		.. index::
		single: Doctrine; Adding mapping metadata
Expand DownExpand Up		@@ -392,7 +392,7 @@ a regular PHP class, you need to create getter and setter methods (e.g. ``getNam

		.. code-block:: bash

		$ phpapp/console doctrine:generate:entities AppBundle/Entity/Product
		$ phpbin/console doctrine:generate:entities AppBundle/Entity/Product

		This command makes sure that all the getters and setters are generated
		for the ``Product`` class. This is a safe command - you can run it over and
Expand DownExpand Up		@@ -434,10 +434,10 @@ mapping information) of a bundle or an entire namespace:
		.. code-block:: bash

		# generates all entities in the AppBundle
		$ phpapp/console doctrine:generate:entities AppBundle
		$ phpbin/console doctrine:generate:entities AppBundle

		# generates all entities of bundles in the Acme namespace
		$ phpapp/console doctrine:generate:entities Acme
		$ phpbin/console doctrine:generate:entities Acme

		.. note::

Expand All		@@ -459,7 +459,7 @@ in your application. To do this, run:

		.. code-block:: bash

		$ phpapp/console doctrine:schema:update --force
		$ phpbin/console doctrine:schema:update --force

		.. tip::

Expand DownExpand Up		@@ -852,7 +852,7 @@ used earlier to generate the missing getter and setter methods:

		.. code-block:: bash

		$ phpapp/console doctrine:generate:entities AppBundle
		$ phpbin/console doctrine:generate:entities AppBundle

		Next, add a new method - ``findAllOrderedByName()`` - to the newly generated
		repository class. This method will query for all the ``Product`` entities,
Expand DownExpand Up		@@ -906,7 +906,7 @@ you can let Doctrine create the class for you.

		.. code-block:: bash

		$ phpapp/console doctrine:generate:entity --no-interaction \
		$ phpbin/console doctrine:generate:entity --no-interaction \
		--entity="AppBundle:Category" \
		--fields="name:string(255)"

Expand DownExpand Up		@@ -1063,7 +1063,7 @@ methods for you:

		.. code-block:: bash

		$ phpapp/console doctrine:generate:entities AppBundle
		$ phpbin/console doctrine:generate:entities AppBundle

		Ignore the Doctrine metadata for a moment. You now have two classes - ``Category``
		and ``Product`` with a natural one-to-many relationship. The ``Category``
Expand DownExpand Up		@@ -1092,7 +1092,7 @@ table, and ``product.category_id`` column, and new foreign key:

		.. code-block:: bash

		$ phpapp/console doctrine:schema:update --force
		$ phpbin/console doctrine:schema:update --force

		.. note::

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -95,8 +95,6 @@ from inside a controller::

		$form = $this->createFormBuilder($task)
		->add('task', TextType::class)
		// If you use PHP 5.3 or 5.4 you must use
		// ->add('task', 'Symfony\Component\Form\Extension\Core\Type\TextType')
		->add('dueDate', DateType::class)
		->add('save', SubmitType::class, array('label' => 'Create Task'))
		->getForm();
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -145,12 +145,9 @@ To enable caching, modify the code of a front controller to use the caching
		kernel::

		// web/app.php
		require_once __DIR__.'/../app/bootstrap.php.cache';
		require_once __DIR__.'/../app/AppKernel.php';
		require_once __DIR__.'/../app/AppCache.php';

		use Symfony\Component\HttpFoundation\Request;

		// ...
		$kernel = new AppKernel('prod', false);
		$kernel->loadClassCache();
		// wrap the default AppKernel with the AppCache one
Expand Down