Merge branch '2.7'

* 2.7: (28 commits)
  Fixing typo thanks to xabbuh
  Add missing comma in array
  Removed unneeded spaces
  Updated as per discussion
  Updated according to comment and changed to AppBundle
  Added configuration of the your_api_key_user_provider as user provider
  fixed typo (acme -> app)
  Fix code examples
  Fix typo: missing of
  Fix typo: missing space
  Fix typo: Fabien => World
  Adding reference link
  Quick proofread of the email cookbook
  Small grammar-ish fix
  Remove horizontal scrollbar
  Fix typos
  Fix typo, remove horizontal scrollbar
  Set twig service as private
  added Kévin as a merger for the Serializer component
  Fix typo: looks => look
  ...

Author: weaverryan

best_practices/business-logic.rst

@@ -140,9 +140,12 @@ the class namespace as a parameter:
     # app/config/services.yml
 
     # service definition with class namespace as parameter
+    parameters:
+        slugger.class: AppBundle\Utils\Slugger
+
     services:
         app.slugger:
-            class: AppBundle\Utils\Slugger
+            class: "%slugger.class%"
 
 This practice is cumbersome and completely unnecessary for your own services:
 

best_practices/configuration.rst

@@ -6,6 +6,8 @@ and security credentials) and different environments (development, production).
 That's why Symfony recommends that you split the application configuration into
 three parts.
 
+.. _config-parameters.yml:
+
 Infrastructure-Related Configuration
 ------------------------------------
 

components/class_loader/class_map_generator.rst

@@ -45,7 +45,7 @@ Generating a Class Map
 ----------------------
 
 To generate the class map, simply pass the root directory of your class files
-to the :method:`Symfony\\Component\\ClassLoader\\ClassMapGenerator::createMap``
+to the :method:`Symfony\\Component\\ClassLoader\\ClassMapGenerator::createMap`
 method::
 
     use Symfony\Component\ClassLoader\ClassMapGenerator;
@@ -115,7 +115,10 @@ the same as in the example above)::
 
     use Symfony\Component\ClassLoader\ClassMapGenerator;
 
-    ClassMapGenerator::dump(array(__DIR__.'/library/bar', __DIR__.'/library/foo'), __DIR__.'/class_map.php');
+    ClassMapGenerator::dump(
+        array(__DIR__.'/library/bar', __DIR__.'/library/foo'),
+        __DIR__.'/class_map.php'
+    );
 
 .. _`PSR-0`: http://www.php-fig.org/psr/psr-0
 .. _`PSR-4`: http://www.php-fig.org/psr/psr-4

components/config/definition.rst

@@ -500,7 +500,7 @@ By changing a string value into an associative array with ``name`` as the key::
             ->arrayNode('connection')
                 ->beforeNormalization()
                     ->ifString()
-                    ->then(function($v) { return array('name'=> $v); })
+                    ->then(function ($v) { return array('name' => $v); })
                 ->end()
                 ->children()
                     ->scalarNode('name')->isRequired()

components/console/changing_default_command.rst

@@ -51,7 +51,7 @@ This will print the following to the command line:
 
 .. code-block:: text
 
-    Hello Fabien
+    Hello World
 
 .. tip::
 

components/console/helpers/debug_formatter.rst

@@ -51,8 +51,8 @@ display information that the program is started::
 
     $output->writeln($debugFormatter->start(
         spl_object_hash($process),
-        'Some process description')
-    );
+        'Some process description'
+    ));
 
     $process->run();
 
@@ -68,7 +68,7 @@ You can tweak the prefix using the third argument::
         spl_object_hash($process),
         'Some process description',
         'STARTED'
-    );
+    ));
     // will output:
     //  STARTED Some process description
 

components/console/helpers/dialoghelper.rst

@@ -230,7 +230,7 @@ this set the seventh argument to ``true``::
         true // enable multiselect
     );
 
-    $selectedColors = array_map(function($c) use ($colors) {
+    $selectedColors = array_map(function ($c) use ($colors) {
         return $colors[$c];
     }, $selected);
 

components/console/helpers/questionhelper.rst

@@ -41,6 +41,24 @@ The second argument to
 is the default value to return if the user doesn't enter any input. Any other
 input will ask the same question again.
 
+.. tip::
+
+    You can customize the regex used to check if the answer means "yes" in the
+    third argument of the constructor. For instance, to allow anything that
+    starts with either ``y`` or ``j``, you would set it to::
+
+        $question = new ConfirmationQuestion(
+            'Continue with this action?',
+            false,
+            '/^(y|j)/i'
+        );
+
+    The regex defaults to ``/^y/i``.
+
+    .. versionadded:: 2.7
+        The regex argument was introduced in Symfony 2.7. Before, only answers
+        starting with ``y`` were considered as "yes".
+
 Asking the User for Information
 -------------------------------
 
@@ -90,7 +108,7 @@ option is the default one.
 If the user enters an invalid string, an error message is shown and the user
 is asked to provide the answer another time, until they enter a valid string
 or reach the maximum number of attempts. The default value for the maximum number
-of attempts is ``null``, which means infinite number attempts. You can define
+of attempts is ``null``, which means infinite number of attempts. You can define
 your own error message using
 :method:`Symfony\\Component\\Console\\Question\\ChoiceQuestion::setErrorMessage`.
 

components/console/introduction.rst

@@ -459,9 +459,11 @@ method::
 
             $command = $application->find('demo:greet');
             $commandTester = new CommandTester($command);
-            $commandTester->execute(
-                array('command' => $command->getName(), 'name' => 'Fabien', '--iterations' => 5)
-            );
+            $commandTester->execute(array(
+                'command'      => $command->getName(),
+                'name'         => 'Fabien',
+                '--iterations' => 5,
+            ));
 
             $this->assertRegExp('/Fabien/', $commandTester->getDisplay());
         }

components/expression_language/syntax.rst

@@ -259,7 +259,7 @@ For example::
     $inGroup = $language->evaluate(
         'user.group in ["human_resources", "marketing"]',
         array(
-            'user' => $user
+            'user' => $user,
         )
     );