symfony · mickaelandrieu · Apr 12, 2016 · Apr 12, 2016 · Apr 12, 2016 · Apr 12, 2016
diff --git a/_build/redirection_map b/_build/redirection_map
@@ -100,6 +100,7 @@
 /cookbook/configuration/environments /configuration/environments
 /cookbook/configuration/external_parameters /configuration/external_parameters
 /cookbook/configuration/front_controllers_and_kernel /configuration/front_controllers_and_kernel
+/cookbook/configuration/micro-kernel-trait /configuration/micro_kernel_trait
 /cookbook/configuration/index /configuration
 /cookbook/configuration/override_dir_structure /configuration/override_dir_structure
 /cookbook/configuration/using_parameters_in_dic /configuration/using_parameters_in_dic
@@ -213,20 +214,25 @@
 /cookbook/security/force_https /security/force_https
 /cookbook/security/form_login /security/form_login
 /cookbook/security/form_login_setup /security/form_login_setup
+/cookbook/security/guard-authentication /security/guard_authentication
 /cookbook/security/host_restriction /security/host_restriction
 /cookbook/security/impersonating_user /security/impersonating_user
+/cookbook/security/ldap /security/ldap
+/cookbook/security/multiple_guard_authenticators /security/multiple_guard_authenticators
 /cookbook/security/index /security
 /cookbook/security/multiple_user_providers /security/multiple_user_providers
 /cookbook/security/named_encoders /security/named_encoders
 /cookbook/security/pre_authenticated /security/pre_authenticated
 /cookbook/security/remember_me /security/remember_me
 /cookbook/security/securing_services /security/securing_services
 /cookbook/security/target_path /security/target_path
+/cookbook/security/user_checkers /security/user_checkers
 /cookbook/security/voters /security/voters
 /cookbook/serializer /serializer
 /cookbook/service_container/compiler_passes /service_container/compiler_passes
 /cookbook/service_container/index /service_container
 /cookbook/service_container/scopes /service_container/scopes
+/cookbook/service_container/shared /service_container/shared
 /cookbook/session/avoid_session_start /session/avoid_session_start
 /cookbook/session/index /session
 /cookbook/session/limit_metadata_writes /session/limit_metadata_writes

diff --git a/_images/controller/error_pages/exceptions-in-dev-environment.png b/_images/controller/error_pages/exceptions-in-dev-environment.png
diff --git a/_images/doctrine/web_debug_toolbar.png b/_images/doctrine/web_debug_toolbar.png
diff --git a/_images/quick_tour/hello_fabien.png b/_images/quick_tour/hello_fabien.png
diff --git a/_images/quick_tour/profiler.png b/_images/quick_tour/profiler.png
diff --git a/_images/quick_tour/web_debug_toolbar.png b/_images/quick_tour/web_debug_toolbar.png
diff --git a/_images/quick_tour/welcome.png b/_images/quick_tour/welcome.png
diff --git a/_images/security/anonymous_wdt.png b/_images/security/anonymous_wdt.png
diff --git a/_images/security/symfony_loggedin_wdt.png b/_images/security/symfony_loggedin_wdt.png
diff --git a/assetic.rst b/assetic.rst
@@ -1,6 +1,8 @@
 Assetic
 =======
 
+.. include:: /assetic/_standard_edition_warning.rst.inc
+
 .. toctree::
     :maxdepth: 1
     :glob:

diff --git a/assetic/_standard_edition_warning.rst.inc b/assetic/_standard_edition_warning.rst.inc
@@ -0,0 +1,5 @@
+.. caution::
+
+    Starting from Symfony 2.8, Assetic is no longer included by default in the
+    Symfony Standard Edition. Refer to :doc:`this article </assetic/asset_management>`
+    to learn how to install and enable Assetic in your Symfony application.
diff --git a/assetic/apply_to_option.rst b/assetic/apply_to_option.rst
@@ -4,6 +4,8 @@
 How to Apply an Assetic Filter to a specific File Extension
 ===========================================================
 
+.. include:: /assetic/_standard_edition_warning.rst.inc
+
 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, suppose that you want to use Assetic's CoffeeScript

diff --git a/assetic/asset_management.rst b/assetic/asset_management.rst
@@ -4,6 +4,89 @@
 How to Use Assetic for Asset Management
 =======================================
 
+Installing and Enabling Assetic
+-------------------------------
+
+Starting from Symfony 2.8, Assetic is no longer included by default in the
+Symfony Standard Edition. Before using any of its features, install the
+AsseticBundle executing this console command in your project:
+
+.. code-block:: bash
+
+    $ composer require symfony/assetic-bundle
+
+Then, enable the bundle in the ``AppKernel.php`` file of your Symfony application::
+
+    // app/AppKernel.php
+
+    // ...
+    class AppKernel extends Kernel
+    {
+        // ...
+
+        public function registerBundles()
+        {
+            $bundles = array(
+                // ...
+                new Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            );
+
+            // ...
+        }
+    }
+
+Finally, add the following minimal configuration to enable Assetic support in
+your application:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/config.yml
+        assetic:
+            debug:          '%kernel.debug%'
+            use_controller: '%kernel.debug%'
+            filters:
+                cssrewrite: ~
+
+        # ...
+
+    .. code-block:: xml
+
+        <!-- app/config/config.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:assetic="http://symfony.com/schema/dic/assetic"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/assetic
+                http://symfony.com/schema/dic/assetic/assetic-1.0.xsd">
+
+            <assetic:config debug="%kernel.debug%" use-controller="%kernel.debug%">
+                <assetic:filters cssrewrite="null" />
+            </assetic:config>
+
+            <!-- ... -->
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('assetic', array(
+            'debug' => '%kernel.debug%',
+            'use_controller' => '%kernel.debug%',
+            'filters' => array(
+                'cssrewrite' => null,
+            ),
+            // ...
+        ));
+
+        // ...
+
+Introducing Assetic
+-------------------
+
 Assetic combines two major ideas: :ref:`assets <assetic-assets>` and
 :ref:`filters <assetic-filters>`. The assets are files such as CSS,
 JavaScript and image files. The filters are things that can be applied to
@@ -515,7 +598,7 @@ each time you deploy), you should run the following command:
 
 .. code-block:: bash
 
-    $ php app/console assetic:dump --env=prod --no-debug
+    $ php bin/console assetic:dump --env=prod --no-debug
 
 This will physically generate and write each file that you need (e.g. ``/js/abcd123.js``).
 If you update any of your assets, you'll need to run this again to regenerate
@@ -567,7 +650,7 @@ need to dump them manually. To do so, run the following command:
 
 .. code-block:: bash
 
-    $ php app/console assetic:dump
+    $ php bin/console assetic:dump
 
 This physically writes all of the asset files you need for your ``dev``
 environment. The big disadvantage is that you need to run this each time
@@ -576,7 +659,7 @@ assets will be regenerated automatically *as they change*:
 
 .. code-block:: bash
 
-    $ php app/console assetic:watch
+    $ php bin/console assetic:watch
 
 The ``assetic:watch`` command was introduced in AsseticBundle 2.4. In prior
 versions, you had to use the ``--watch`` option of the ``assetic:dump``

diff --git a/assetic/jpeg_optimize.rst b/assetic/jpeg_optimize.rst
@@ -4,6 +4,8 @@
 How to Use Assetic for Image Optimization with Twig Functions
 =============================================================
 
+.. include:: /assetic/_standard_edition_warning.rst.inc
+
 Among its many filters, Assetic has four filters which can be used for on-the-fly
 image optimization. This allows you to get the benefits of smaller file sizes
 without having to use an image editor to process each image. The results

diff --git a/assetic/php.rst b/assetic/php.rst
@@ -4,6 +4,8 @@
 Combining, Compiling and Minimizing Web Assets with PHP Libraries
 =================================================================
 
+.. include:: /assetic/_standard_edition_warning.rst.inc
+
 The official Symfony Best Practices recommend to use Assetic to
 :doc:`manage web assets </best_practices/web-assets>`, unless you are
 comfortable with JavaScript-based front-end tools.

diff --git a/assetic/uglifyjs.rst b/assetic/uglifyjs.rst
@@ -4,6 +4,8 @@
 How to Minify CSS/JS Files (Using UglifyJS and UglifyCSS)
 =========================================================
 
+.. include:: /assetic/_standard_edition_warning.rst.inc
+
 `UglifyJS`_ is a JavaScript parser/compressor/beautifier toolkit. It can be used
 to combine and minify JavaScript assets so that they require less HTTP requests
 and make your site load faster. `UglifyCSS`_ is a CSS compressor/beautifier

diff --git a/assetic/yuicompressor.rst b/assetic/yuicompressor.rst
@@ -10,6 +10,8 @@ How to Minify JavaScripts and Stylesheets with YUI Compressor
     **strongly advised to avoid using YUI utilities** unless strictly necessary.
     Read :doc:`/assetic/uglifyjs` for a modern and up-to-date alternative.
 
+.. include:: /assetic/_standard_edition_warning.rst.inc
+
 Yahoo! provides an excellent utility for minifying JavaScripts and stylesheets
 so they travel over the wire faster, the `YUI Compressor`_. Thanks to Assetic,
 you can take advantage of this tool very easily.

diff --git a/best_practices/business-logic.rst b/best_practices/business-logic.rst
@@ -21,6 +21,8 @@ Inside here, you can create whatever directories you want to organize things:
     │  └─ AppBundle/
     │     └─ Utils/
     │        └─ MyClass.php
+    ├─ tests/
+    ├─ var/
     ├─ vendor/
     └─ web/
 
@@ -40,6 +42,8 @@ and put things there:
     │  │   └─ Utils/
     │  │      └─ MyClass.php
     │  └─ AppBundle/
+    ├─ tests/
+    ├─ var/
     ├─ vendor/
     └─ web/
 
@@ -318,7 +322,7 @@ command:
 
 .. code-block:: bash
 
-    $ php app/console doctrine:fixtures:load
+    $ php bin/console doctrine:fixtures:load
 
     Careful, database will be purged. Do you want to continue Y/N ? Y
       > purging database

diff --git a/best_practices/configuration.rst b/best_practices/configuration.rst
@@ -52,8 +52,8 @@ Canonical Parameters
     Define all your application's parameters in the
     ``app/config/parameters.yml.dist`` file.
 
-Since version 2.3, Symfony includes a configuration file called ``parameters.yml.dist``,
-which stores the canonical list of configuration parameters for the application.
+Symfony includes a configuration file called ``parameters.yml.dist``, which
+stores the canonical list of configuration parameters for the application.
 
 Whenever a new configuration parameter is defined for the application, you
 should also add it to this file and submit the changes to your version control

diff --git a/best_practices/creating-the-project.rst b/best_practices/creating-the-project.rst
@@ -27,7 +27,6 @@ to create files and execute the following commands:
 
 .. code-block:: bash
 
-    # Linux, Mac OS X
     $ cd projects/
     $ symfony new blog
 
@@ -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
@@ -107,8 +114,7 @@ ProductBundle, then there's no advantage to having two separate bundles.
     Create only one bundle called AppBundle for your application logic.
 
 Implementing a single AppBundle bundle in your projects will make your code
-more concise and easier to understand. Starting in Symfony 2.6, the official
-Symfony documentation uses the AppBundle name.
+more concise and easier to understand.
 
 .. note::
 
@@ -128,13 +134,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
@@ -147,7 +158,7 @@ that follows these best practices:
 
     .. code-block:: bash
 
-        $ php app/console generate:bundle --namespace=AppBundle --dir=src --format=annotation --no-interaction
+        $ php bin/console generate:bundle --namespace=AppBundle --dir=src --format=annotation --no-interaction
 
 Extending the Directory Structure
 ---------------------------------
@@ -157,27 +168,6 @@ structure of Symfony, you can
 :doc:`override the location of the main directories </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/
 .. _`Phar extension`: http://php.net/manual/en/intro.phar.php
 .. _`public checksums repository`: https://github.com/sensiolabs/checksums