Merge branch '2.7' into 2.8

* 2.7:
  [#7507] fix component name
  [#7490] minor typo fix
  Added a note about redirections to absolute URLs in tests
  Added the changes suggested by reviewers
  Fixed status code test
  Improved a test
  Merged and improved the articles about testing + authentication
  Reworded the section about form overridding
  Update installation.rst
  Update prepend_extension.rst
  Update override.rst
  Update installation.rst
  Update inheritance.rst
  Unify placeholders in documentation and code

Author: xabbuh

_build/redirection_map

@@ -331,3 +331,4 @@
 /deployment/tools /deployment
 /install/bundles /setup/bundles
 /form /forms
+/testing/simulating_authentication /testing/http_authentication

bundles/inheritance.rst

@@ -93,8 +93,9 @@ The same goes for routing files and some other resources.
 
     The overriding of resources only works when you refer to resources with
     the ``@FOSUserBundle/Resources/config/routing/security.xml`` method.
-    If you refer to resources without using the ``@BundleName`` shortcut, they
-    can't be overridden in this way.
+    You need to use the ``@BundleName`` shortcut when referring to resources
+    so they can be successfully overridden (except templates, which are
+    overridden in a different way, as explained in :doc:`/templating/overriding`).
 
 .. caution::
 

bundles/installation.rst

@@ -48,7 +48,7 @@ version, include it as the second argument of the `composer require`_ command:
 B) Enable the Bundle
 --------------------
 
-At this point, the bundle is installed in your Symfony project (in
+At this point, the bundle is installed in your Symfony project (e.g. 
 ``vendor/friendsofsymfony/``) and the autoloader recognizes its classes.
 The only thing you need to do now is register the bundle in ``AppKernel``::
 

bundles/override.rst

@@ -39,7 +39,7 @@ Services & Configuration
 
 If you want to modify service definitions of another bundle, you can use a compiler
 pass to change the class of the service or to modify method calls. In the following
-example, the implementing class for the ``original-service-id`` is changed to 
+example, the implementing class for the ``original-service-id`` is changed to
 ``Acme\DemoBundle\YourService``::
 
     // src/Acme/DemoBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
@@ -72,16 +72,8 @@ associations. Learn more about this feature and its limitations in
 Forms
 -----
 
-As of Symfony 2.8, form types are referred to by their fully-qualified class name::
-
-    $builder->add('name', CustomType::class);
-
-This means that you cannot override this by creating a sub-class of ``CustomType``
-and registering it as a service, and tagging it with ``form.type`` (you *could*
-do this in earlier version).
-
-Instead, you should use a "form type extension" to modify the existing form type.
-For more information, see :doc:`/form/create_form_type_extension`.
+Existing form types can be modified defining
+:doc:`form type extensions </form/create_form_type_extension>`.
 
 .. _override-validation:
 
@@ -92,7 +84,7 @@ Symfony loads all validation configuration files from every bundle and
 combines them into one validation metadata tree. This means you are able to
 add new constraints to a property, but you cannot override them.
 
-To override this, the 3rd party bundle needs to have configuration for
+To overcome this, the 3rd party bundle needs to have configuration for
 :doc:`validation groups </validation/groups>`. For instance, the FOSUserBundle
 has this configuration. To create your own validation, add the constraints
 to a new validation group:

bundles/prepend_extension.rst

@@ -2,7 +2,7 @@
    single: Configuration; Semantic
    single: Bundle; Extension configuration
 
-How to Simplify Configuration of multiple Bundles
+How to Simplify Configuration of Multiple Bundles
 =================================================
 
 When building reusable and extensible applications, developers are often
@@ -12,9 +12,9 @@ users to choose to remove functionality they are not using. Creating multiple
 bundles has the drawback that configuration becomes more tedious and settings
 often need to be repeated for various bundles.
 
-Using the below approach, it is possible to remove the disadvantage of the
-multiple bundle approach by enabling a single Extension to prepend the settings
-for any bundle. It can use the settings defined in the ``app/config/config.yml``
+It is possible to remove the disadvantage of the multiple bundle approach 
+by enabling a single Extension to prepend the settings for any bundle.
+It can use the settings defined in the ``app/config/config.yml``
 to prepend settings just as if they had been written explicitly by
 the user in the application configuration.
 

testing.rst

@@ -285,8 +285,9 @@ document::
 
         // Assert that the response is a redirect to /demo/contact
         $this->assertTrue(
-            $client->getResponse()->isRedirect('/demo/contact'),
-            'response is a redirect to /demo/contact'
+            $client->getResponse()->isRedirect('/demo/contact')
+            // if the redirection URL was generated as an absolute URL
+            // $client->getResponse()->isRedirect('http://localhost/demo/contact')
         );
         // ...or simply check that the response is a redirect to any URL
         $this->assertTrue($client->getResponse()->isRedirect());

testing/http_authentication.rst

@@ -4,26 +4,24 @@
 How to Simulate HTTP Authentication in a Functional Test
 ========================================================
 
-If your application needs HTTP authentication, pass the username and password
-as server variables to ``createClient()``::
+Authenticating requests in functional tests can slow down the entire test suite.
+This could become an issue especially when the tests reproduce the same steps
+that users follow to authenticate, such as submitting a login form or using
+OAuth authentication services.
 
-    $client = static::createClient(array(), array(
-        'PHP_AUTH_USER' => 'username',
-        'PHP_AUTH_PW'   => 'pa$$word',
-    ));
+This article explains the two most popular techniques to avoid these issues and
+create fast tests when using authentication.
 
-You can also override it on a per request basis::
+Using a Faster Authentication Mechanism Only for Tests
+------------------------------------------------------
 
-    $client->request('DELETE', '/post/12', array(), array(), array(
-        'PHP_AUTH_USER' => 'username',
-        'PHP_AUTH_PW'   => 'pa$$word',
-    ));
+When your application is using a ``form_login`` authentication, you can make
+your tests faster by allowing them to use HTTP authentication. This way your
+tests authenticate with the simple and fast HTTP Basic method whilst your real
+users still log in via the normal login form.
 
-When your application is using a ``form_login``, you can simplify your tests
-by allowing your test configuration to make use of HTTP authentication. This
-way you can use the above to authenticate in tests, but still have your users
-log in via the normal ``form_login``. The trick is to include the ``http_basic``
-key in your firewall, along with the ``form_login`` key:
+The trick is to use the ``http_basic`` authentication in your application
+firewall, but only in the configuration file used by tests:
 
 .. configuration-block::
 
@@ -54,3 +52,72 @@ key in your firewall, along with the ``form_login`` key:
                 ),
             ),
         ));
+
+Tests can now authenticate via HTTP passing the username and password as server
+variables using the second argument of ``createClient()``::
+
+    $client = static::createClient(array(), array(
+        'PHP_AUTH_USER' => 'username',
+        'PHP_AUTH_PW'   => 'pa$$word',
+    ));
+
+The username and password can also be passed on a per request basis::
+
+    $client->request('DELETE', '/post/12', array(), array(), array(
+        'PHP_AUTH_USER' => 'username',
+        'PHP_AUTH_PW'   => 'pa$$word',
+    ));
+
+Creating the Authentication Token
+---------------------------------
+
+If your application uses a more advanced authentication mechanism, you can't
+use the previous trick, but it's still possible to make tests faster. The trick
+now is to bypass the authentication process, create the *authentication token*
+yourself and store it in the session.
+
+This technique requires some knowledge of the Security component internals,
+but the following example shows a complete example that you can adapt to your
+needs::
+
+    // src/AppBundle/Tests/Controller/DefaultControllerTest.php
+    namespace Appbundle\Tests\Controller;
+
+    use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+    use Symfony\Component\BrowserKit\Cookie;
+    use Symfony\Component\HttpFoundation\Response;
+    use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
+
+    class DefaultControllerTest extends WebTestCase
+    {
+        private $client = null;
+
+        public function setUp()
+        {
+            $this->client = static::createClient();
+        }
+
+        public function testSecuredHello()
+        {
+            $this->logIn();
+            $crawler = $this->client->request('GET', '/admin');
+
+            $this->assertSame(Response::HTTP_OK, $this->client->getResponse()->getStatusCode());
+            $this->assertSame('Admin Dashboard', $crawler->filter('h1')->text());
+        }
+
+        private function logIn()
+        {
+            $session = $this->client->getContainer()->get('session');
+
+            // the firewall context defaults to the firewall name
+            $firewallContext = 'secured_area';
+
+            $token = new UsernamePasswordToken('admin', null, $firewallContext, array('ROLE_ADMIN'));
+            $session->set('_security_'.$firewallContext, serialize($token));
+            $session->save();
+
+            $cookie = new Cookie($session->getName(), $session->getId());
+            $this->client->getCookieJar()->set($cookie);
+        }
+    }

testing/simulating_authentication.rst

@@ -24,7 +24,7 @@ First you need to create a Constraint class and extend :class:`Symfony\\Componen
      */
     class ContainsAlphanumeric extends Constraint
     {
-        public $message = 'The string "%string%" contains an illegal character: it can only contain letters or numbers.';
+        public $message = 'The string "{{ string }}" contains an illegal character: it can only contain letters or numbers.';
     }
 
 .. note::
@@ -67,14 +67,14 @@ The validator class is also simple, and only has one required method ``validate(
             if (!preg_match('/^[a-zA-Z0-9]+$/', $value, $matches)) {
                 // If you're using the new 2.5 validation API (you probably are!)
                 $this->context->buildViolation($constraint->message)
-                    ->setParameter('%string%', $value)
+                    ->setParameter('{{ string }}', $value)
                     ->addViolation();
 
                 // If you're using the old 2.4 validation API
                 /*
                 $this->context->addViolation(
                     $constraint->message,
-                    array('%string%' => $value)
+                    array('{{ string }}' => $value)
                 );
                 */
             }