Merge remote-tracking branch 'upstream/3.3' into 3.3

Author: javiereguiluz

bundles.rst

@@ -58,8 +58,8 @@ are used by your application (including the core Symfony bundles).
 
 .. tip::
 
-   A bundle can live *anywhere* as long as it can be autoloaded (via the
-   autoloader configured at ``app/autoload.php``).
+    A bundle can live *anywhere* as long as it can be autoloaded (via the
+    autoloader configured at ``app/autoload.php``).
 
 Creating a Bundle
 -----------------
@@ -90,10 +90,10 @@ called ``AcmeTestBundle.php``::
 
 .. tip::
 
-   The name AcmeTestBundle follows the standard
-   :ref:`Bundle naming conventions <bundles-naming-conventions>`. You could
-   also choose to shorten the name of the bundle to simply TestBundle by naming
-   this class TestBundle (and naming the file ``TestBundle.php``).
+    The name AcmeTestBundle follows the standard
+    :ref:`Bundle naming conventions <bundles-naming-conventions>`. You could
+    also choose to shorten the name of the bundle to simply TestBundle by naming
+    this class TestBundle (and naming the file ``TestBundle.php``).
 
 This empty class is the only piece you need to create the new bundle. Though
 commonly empty, this class is powerful and can be used to customize the behavior
@@ -130,9 +130,9 @@ tools later.
 
 .. tip::
 
-   Whenever creating a new bundle or using a third-party bundle, always make
-   sure the bundle has been enabled in ``registerBundles()``. When using
-   the ``generate:bundle`` command, this is done for you.
+    Whenever creating a new bundle or using a third-party bundle, always make
+    sure the bundle has been enabled in ``registerBundles()``. When using
+    the ``generate:bundle`` command, this is done for you.
 
 Bundle Directory Structure
 --------------------------

bundles/best_practices.rst

@@ -116,21 +116,21 @@ The following classes and files have specific emplacements (some are mandatory
 and others are just conventions followed by most developers):
 
 ===================================================  ========================================
-Type                                                 Directory                               
+Type                                                 Directory
 ===================================================  ========================================
-Commands                                             ``Command/``                            
-Controllers                                          ``Controller/``                         
-Service Container Extensions                         ``DependencyInjection/``                
+Commands                                             ``Command/``
+Controllers                                          ``Controller/``
+Service Container Extensions                         ``DependencyInjection/``
 Doctrine ORM entities (when not using annotations)   ``Entity/``
 Doctrine ODM documents (when not using annotations)  ``Document/``
-Event Listeners                                      ``EventListener/``                      
-Configuration                                        ``Resources/config/``                   
-Web Resources (CSS, JS, images)                      ``Resources/public/``                   
-Translation files                                    ``Resources/translations/``     
+Event Listeners                                      ``EventListener/``
+Configuration                                        ``Resources/config/``
+Web Resources (CSS, JS, images)                      ``Resources/public/``
+Translation files                                    ``Resources/translations/``
 Validation (when not using annotations)              ``Resources/config/validation/``
 Serialization (when not using annotations)           ``Resources/config/serialization/``
-Templates                                            ``Resources/views/``                    
-Unit and Functional Tests                            ``Tests/``                              
+Templates                                            ``Resources/views/``
+Unit and Functional Tests                            ``Tests/``
 ===================================================  ========================================
 
 Classes
@@ -174,19 +174,19 @@ the ``Tests/`` directory. Tests should follow the following principles:
 
 .. note::
 
-   A test suite must not contain ``AllTests.php`` scripts, but must rely on the
-   existence of a ``phpunit.xml.dist`` file.
+    A test suite must not contain ``AllTests.php`` scripts, but must rely on the
+    existence of a ``phpunit.xml.dist`` file.
 
 Documentation
 -------------
 
 All classes and functions must come with full PHPDoc.
 
-Extensive documentation should also be provided in the ``Resources/doc/`` 
+Extensive documentation should also be provided in the ``Resources/doc/``
 directory.
-The index file (for example ``Resources/doc/index.rst`` or 
-``Resources/doc/index.md``) is the only mandatory file and must be the entry 
-point for the documentation. The 
+The index file (for example ``Resources/doc/index.rst`` or
+``Resources/doc/index.md``) is the only mandatory file and must be the entry
+point for the documentation. The
 :doc:`reStructuredText (rST) </contributing/documentation/format>` is the format
 used to render the documentation on symfony.com.
 

bundles/inheritance.rst

@@ -99,9 +99,9 @@ The same goes for routing files and some other resources.
 
 .. caution::
 
-   Translation and validation files do not work in the same way as described
-   above. Read ":ref:`override-translations`" if you want to learn how to
-   override translations and see ":ref:`override-validation`" for tricks to
-   override the validation.
+    Translation and validation files do not work in the same way as described
+    above. Read ":ref:`override-translations`" if you want to learn how to
+    override translations and see ":ref:`override-validation`" for tricks to
+    override the validation.
 
 .. _`FOSUserBundle`: https://github.com/friendsofsymfony/fosuserbundle

components/asset.rst

@@ -5,8 +5,8 @@
 The Asset Component
 ===================
 
-   The Asset component manages URL generation and versioning of web assets such
-   as CSS stylesheets, JavaScript files and image files.
+    The Asset component manages URL generation and versioning of web assets such
+    as CSS stylesheets, JavaScript files and image files.
 
 In the past, it was common for web applications to hardcode URLs of web assets.
 For example:

components/event_dispatcher.rst

@@ -402,14 +402,14 @@ the dispatcher to stop all propagation of the event to future listeners
 inside a listener via the
 :method:`Symfony\\Component\\EventDispatcher\\Event::stopPropagation` method::
 
-   use Acme\Store\Event\OrderPlacedEvent;
+    use Acme\Store\Event\OrderPlacedEvent;
 
-   public function onStoreOrder(OrderPlacedEvent $event)
-   {
-       // ...
+    public function onStoreOrder(OrderPlacedEvent $event)
+    {
+        // ...
 
-       $event->stopPropagation();
-   }
+        $event->stopPropagation();
+    }
 
 Now, any listeners to ``order.placed`` that have not yet been called will
 *not* be called.

components/finder.rst

@@ -5,8 +5,8 @@
 The Finder Component
 ====================
 
-   The Finder component finds files and directories via an intuitive fluent
-   interface.
+    The Finder component finds files and directories via an intuitive fluent
+    interface.
 
 Installation
 ------------

components/process.rst

@@ -331,12 +331,12 @@ Process Idle Timeout
 In contrast to the timeout of the previous paragraph, the idle timeout only
 considers the time since the last output was produced by the process::
 
-   use Symfony\Component\Process\Process;
+    use Symfony\Component\Process\Process;
 
-   $process = new Process('something-with-variable-runtime');
-   $process->setTimeout(3600);
-   $process->setIdleTimeout(60);
-   $process->run();
+    $process = new Process('something-with-variable-runtime');
+    $process->setTimeout(3600);
+    $process->setIdleTimeout(60);
+    $process->run();
 
 In the case above, a process is considered timed out, when either the total runtime
 exceeds 3600 seconds, or the process does not produce any output for 60 seconds.

components/routing.rst

@@ -5,8 +5,8 @@
 The Routing Component
 =====================
 
-   The Routing component maps an HTTP request to a set of configuration
-   variables.
+    The Routing component maps an HTTP request to a set of configuration
+    variables.
 
 Installation
 ------------
@@ -100,28 +100,28 @@ A full route definition can contain up to seven parts:
 
 Take the following route, which combines several of these ideas::
 
-   $route = new Route(
-       '/archive/{month}', // path
-       array('_controller' => 'showArchive'), // default values
-       array('month' => '[0-9]{4}-[0-9]{2}', 'subdomain' => 'www|m'), // requirements
-       array(), // options
-       '{subdomain}.example.com', // host
-       array(), // schemes
-       array() // methods
-   );
-
-   // ...
-
-   $parameters = $matcher->match('/archive/2012-01');
-   // array(
-   //     '_controller' => 'showArchive',
-   //     'month' => '2012-01',
-   //     'subdomain' => 'www',
-   //     '_route' => ...
-   //  )
-
-   $parameters = $matcher->match('/archive/foo');
-   // throws ResourceNotFoundException
+    $route = new Route(
+        '/archive/{month}', // path
+        array('_controller' => 'showArchive'), // default values
+        array('month' => '[0-9]{4}-[0-9]{2}', 'subdomain' => 'www|m'), // requirements
+        array(), // options
+        '{subdomain}.example.com', // host
+        array(), // schemes
+        array() // methods
+    );
+
+    // ...
+
+    $parameters = $matcher->match('/archive/2012-01');
+    // array(
+    //     '_controller' => 'showArchive',
+    //     'month' => '2012-01',
+    //     'subdomain' => 'www',
+    //     '_route' => ...
+    //  )
+
+    $parameters = $matcher->match('/archive/foo');
+    // throws ResourceNotFoundException
 
 In this case, the route is matched by ``/archive/2012-01``, because the ``{month}``
 wildcard matches the regular expression wildcard given. However, ``/archive/foo``

components/serializer.rst

@@ -5,8 +5,8 @@
 The Serializer Component
 ========================
 
-   The Serializer component is meant to be used to turn objects into a
-   specific format (XML, JSON, YAML, ...) and the other way around.
+    The Serializer component is meant to be used to turn objects into a
+    specific format (XML, JSON, YAML, ...) and the other way around.
 
 In order to do so, the Serializer component follows the following
 simple schema.

configuration/environments.rst

@@ -166,9 +166,9 @@ Either way: *one of these two files is always executed*.
 
 .. note::
 
-   The given URLs assume that your web server is configured to use the ``web/``
-   directory of the application as its root. Read more in
-   :doc:`Installing Symfony </setup>`.
+    The given URLs assume that your web server is configured to use the ``web/``
+    directory of the application as its root. Read more in
+    :doc:`Installing Symfony </setup>`.
 
 If you open up one of these files, you'll quickly see that the environment
 used by each is explicitly set::
@@ -186,10 +186,10 @@ this code and changing the environment string.
 
 .. note::
 
-   The ``test`` environment is used when writing functional tests and is
-   not accessible in the browser directly via a front controller. In other
-   words, unlike the other environments, there is no ``app_test.php`` front
-   controller file.
+    The ``test`` environment is used when writing functional tests and is
+    not accessible in the browser directly via a front controller. In other
+    words, unlike the other environments, there is no ``app_test.php`` front
+    controller file.
 
 .. index::
    single: Configuration; Debug mode