Merge branch '2.1' into 2.2

Author: weaverryan

components/http_foundation/introduction.rst

@@ -10,7 +10,7 @@ The HttpFoundation Component
     specification.
 
 In PHP, the request is represented by some global variables (``$_GET``,
-``$_POST``, ``$_FILE``, ``$_COOKIE``, ``$_SESSION``, ...) and the response is
+``$_POST``, ``$_FILES``, ``$_COOKIE``, ``$_SESSION``, ...) and the response is
 generated by some functions (``echo``, ``header``, ``setcookie``, ...).
 
 The Symfony2 HttpFoundation component replaces these default PHP global
@@ -61,7 +61,7 @@ can be accessed via several public properties:
 
 * ``attributes``: no equivalent - used by your app to store other data (see :ref:`below<component-foundation-attributes>`)
 
-* ``files``: equivalent of ``$_FILE``;
+* ``files``: equivalent of ``$_FILES``;
 
 * ``server``: equivalent of ``$_SERVER``;
 

cookbook/controller/error_pages.rst

@@ -16,7 +16,7 @@ control you need:
 
 1. Customize the error templates of the different error pages (explained below);
 
-2. Replace the default exception controller ``TwigBundle::Exception:show``
+2. Replace the default exception controller ``TwigBundle:Exception:show``
    with your own controller and handle it however you want (see
    :ref:`exception_controller in the Twig reference<config-twig-exception-controller>`);
 

cookbook/testing/database.rst

@@ -91,7 +91,7 @@ it's easy to pass a mock object within a test::
                 ->will($this->returnValue($employeeRepository));
             
             $salaryCalculator = new SalaryCalculator($entityManager);
-            $this->assertEquals(1100, $salaryCalculator->calculateTotalSalary(1));
+            $this->assertEquals(2100, $salaryCalculator->calculateTotalSalary(1));
         }
     }
     

reference/dic_tags.rst

@@ -41,6 +41,8 @@ may also be tags in other bundles you use that aren't listed here.
 +-----------------------------------+---------------------------------------------------------------------------+
 | `form.type_guesser`_              | Add your own logic for "form type guessing"                               |
 +-----------------------------------+---------------------------------------------------------------------------+
+| `kernel.cache_clearer`_           | Register your service to be called during the cache clearing process      |
++-----------------------------------+---------------------------------------------------------------------------+
 | `kernel.cache_warmer`_            | Register your service to be called during the cache warming process       |
 +-----------------------------------+---------------------------------------------------------------------------+
 | `kernel.event_listener`_          | Listen to different events/hooks in Symfony                               |
@@ -338,6 +340,57 @@ tag its service definition with ``form.type_guesser`` (it has no options).
 To see an example of how this class might look, see the ``ValidatorTypeGuesser``
 class in the ``Form`` component.
 
+kernel.cache_clearer
+--------------------
+
+**Purpose**: Register your service to be called during the cache clearing process
+
+Cache clearing occurs whenever you call ``cache:clear`` command. If your
+bundle caches files, you should add custom cache clearer for clearing those
+files during the cache clearing process.
+
+In order to register your custom cache clearer, first you must create a
+service class::
+
+    // src/Acme/MainBundle/Cache/MyClearer.php
+    namespace Acme\MainBundle\Cache;
+
+    use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
+
+    class MyClearer implements CacheClearerInterface
+    {
+        public function clear($cacheDir)
+        {
+            // clear your cache
+        }
+
+    }
+
+Then register this class and tag it with ``kernel.cache:clearer``:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        services:
+            my_cache_clearer:
+                class: Acme\MainBundle\Cache\MyClearer
+                tags:
+                    - { name: kernel.cache_clearer }
+
+    .. code-block:: xml
+
+        <service id="my_cache_clearer" class="Acme\MainBundle\Cache\MyClearer">
+            <tag name="kernel.cache_clearer" />
+        </service>
+
+    .. code-block:: php
+
+        $container
+            ->register('my_cache_clearer', 'Acme\MainBundle\Cache\MyClearer')
+            ->addTag('kernel.cache_clearer')
+        ;
+
 kernel.cache_warmer
 -------------------