Merge branch '3.1'

* 3.1:
  Remove suggestion to change the  parameters
  Also mention "hassers"
  A bracket was missed
  Update birthday.rst
  Improved Redirecting paragraph of Testing page
  link to specific HTTP Cache RFC
  Added jQuery symfony-collection plugin to Form collection docs
  Update bug documintation input console /console/input.rst
  Update custom_authentication_provider.rst
  update github example
  Update metadata.rst
  remove caution message
  Simple typo fix

Author: xabbuh

bundles/override.rst

@@ -37,39 +37,10 @@ If the controller is a service, see the next section on how to override it.
 Services & Configuration
 ------------------------
 
-In order to override/extend a service, there are two options. First, you can
-set the parameter holding the service's class name to your own class by setting
-it in ``app/config/config.yml``. This of course is only possible if the class name is
-defined as a parameter in the service config of the bundle containing the
-service. For example, to override the class used for Symfony's ``translator``
-service, you would override the ``translator.class`` parameter. Knowing exactly
-which parameter to override may take some research. For the translator, the
-parameter is defined and used in the ``Resources/config/translation.xml`` file
-in the core FrameworkBundle:
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # app/config/config.yml
-        parameters:
-            translator.class: Acme\HelloBundle\Translation\Translator
-
-    .. code-block:: xml
-
-        <!-- app/config/config.xml -->
-        <parameters>
-            <parameter key="translator.class">Acme\HelloBundle\Translation\Translator</parameter>
-        </parameters>
-
-    .. code-block:: php
-
-        // app/config/config.php
-        $container->setParameter('translator.class', 'Acme\HelloBundle\Translation\Translator');
-
-Secondly, if the class is not available as a parameter, you want to make sure the
-class is always overridden when your bundle is used or if you need to modify
-something beyond just the class name, you should use a compiler pass::
+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 
+``Acme\DemoBundle\YourService``::
 
     // src/Acme/DemoBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
     namespace Acme\DemoBundle\DependencyInjection\Compiler;
@@ -86,12 +57,7 @@ something beyond just the class name, you should use a compiler pass::
         }
     }
 
-In this example you fetch the service definition of the original service, and set
-its class name to your own class.
-
-See :doc:`/service_container/compiler_passes` for information on how to use
-compiler passes. If you want to do something beyond just overriding the class,
-like adding a method call, you can only use the compiler pass method.
+For more information on compiler passes, see :doc:`/service_container/compiler_passes`.
 
 Entities & Entity Mapping
 -------------------------

components/cache.rst

@@ -51,7 +51,7 @@ a filesystem-based cache, instantiate :class:`Symfony\\Component\\Cache\\Adapter
 
     $cache = new FilesystemAdapter();
 
-Now you can create, retrieve, updated and delete items using this cache pool::
+Now you can create, retrieve, update and delete items using this cache pool::
 
     // create a new item by trying to get it from the cache
     $numProducts = $cache->getItem('stats.num_products');

components/dom_crawler.rst

@@ -440,7 +440,7 @@ directly::
     $crawler = $client->request('GET', 'https://github.com/login');
 
     // select the form and fill in some values
-    $form = $crawler->selectButton('Log in')->form();
+    $form = $crawler->selectButton('Sign in')->form();
     $form['login'] = 'symfonyfan';
     $form['password'] = 'anypass';
 

components/validator/metadata.rst

@@ -36,8 +36,8 @@ Getters
 -------
 
 Constraints can also be applied to the value returned by any public *getter*
-method, which are the methods whose names start with ``get`` or ``is``. This
-feature allows to validate your objects dynamically.
+method, which are the methods whose names start with ``get``, ``has`` or ``is``.
+This feature allows to validate your objects dynamically.
 
 Suppose that, for security reasons, you want to validate that a password field
 doesn't match the first name of the user. First, create a public method called
@@ -58,7 +58,7 @@ Then, add the Validator component configuration to the class::
     {
         public static function loadValidatorMetadata(ClassMetadata $metadata)
         {
-            $metadata->addGetterConstraint('passwordSafe', new Assert\True(array(
+            $metadata->addGetterConstraint('passwordSafe', new Assert\IsTrue(array(
                 'message' => 'The password cannot match your first name',
             )));
         }

console/input.rst

@@ -41,7 +41,7 @@ You now have access to a ``last_name`` argument in your command::
         {
             $text = 'Hi '.$input->getArgument('name');
 
-            $lastName = $input->getArgument('last_name')
+            $lastName = $input->getArgument('last_name');
             if ($lastName) {
                 $text .= ' '.$lastName;
             }

form/form_collections.rst

@@ -732,5 +732,13 @@ the relationship between the removed ``Tag`` and ``Task`` object.
     updated (whether you're adding new tags or removing existing tags) on
     each Tag object itself.
 
+.. sidebar:: Form collection jQuery plugin
+
+    The jQuery plugin  `symfony-collection`_ helps with ``collection`` form elements,
+    by providing the JavaScript functionality needed to add, edit and delete
+    elements of the collection. More advanced functionality like moving or duplicating
+    an element in the collection and customizing the buttons is also possible.
+
 .. _`Owning Side and Inverse Side`: http://docs.doctrine-project.org/en/latest/reference/unitofwork-associations.html
 .. _`JSFiddle`: http://jsfiddle.net/847Kf/4/
+.. _`symfony-collection`: https://github.com/ninsuo/symfony-collection

http_cache.rst

@@ -19,7 +19,7 @@ isn't always possible for highly dynamic sites, or is it? With
 on only *fragments* of your site.
 
 The Symfony cache system is different because it relies on the simplicity
-and power of the HTTP cache as defined in the `HTTP specification`_. Instead of
+and power of the HTTP cache as defined in `RFC 7234 - Caching`_. Instead of
 reinventing a caching methodology, Symfony embraces the standard that defines
 basic communication on the Web. Once you understand the fundamental HTTP
 validation and expiration caching models, you'll be ready to master the Symfony
@@ -367,4 +367,3 @@ Learn more
 .. _`RFC 7234 - Caching`: https://tools.ietf.org/html/rfc7234
 .. _`RFC 7232 - Conditional Requests`: https://tools.ietf.org/html/rfc7232
 .. _`FOSHttpCacheBundle`: http://foshttpcachebundle.readthedocs.org/
-.. _`HTTP specification`: http://www.w3.org/Protocols/rfc2616/rfc2616.html

reference/forms/types/birthday.rst

@@ -77,14 +77,14 @@ If your widget option is set to ``choice``, then this field will be represented
 as a series of ``select`` boxes. When the placeholder value is a string,
 it will be used as the **blank value** of all select boxes::
 
-    $builder->add('birthdate', 'birthday', array(
+    $builder->add('birthdate', BirthdayType::class, array(
         'placeholder' => 'Select a value',
     ));
 
 Alternatively, you can use an array that configures different placeholder
 values for the year, month and day fields::
 
-    $builder->add('birthdate', 'birthday', array(
+    $builder->add('birthdate', BirthdayType::class, array(
         'placeholder' => array(
             'year' => 'Year', 'month' => 'Month', 'day' => 'Day',
         )

reference/forms/types/choice.rst

@@ -132,18 +132,18 @@ You can easily "group" options in a select by passing a multi-dimensional choice
     use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
     // ...
 
-    $builder->add('stockStatus', ChoiceType::class, [
-        'choices' => [
-            'Main Statuses' => [
+    $builder->add('stockStatus', ChoiceType::class, array(
+        'choices' => array(
+            'Main Statuses' => array(
                 'Yes' => 'stock_yes',
                 'No' => 'stock_no',
-            ],
-            'Out of Stock Statuses' => [
+            ),
+            'Out of Stock Statuses' => array(
                 'Backordered' => 'stock_backordered',
                 'Discontinued' => 'stock_discontinued',
-            ]
-        ],
-    );
+            ),
+        ),
+    ));
 
 .. image:: /_images/reference/form/choice-example4.png
    :align: center

security/custom_authentication_provider.rst

@@ -8,7 +8,7 @@ How to Create a custom Authentication Provider
 
     Creating a custom authentication system is hard, and this entry will walk
     you through that process. But depending on your needs, you may be able
-    to solve your problem in a simpler, or via a community bundle:
+    to solve your problem in a simpler manner, or via a community bundle:
 
     * :doc:`/security/guard_authentication`
     * :doc:`/security/custom_password_authenticator`

service_container/alias_private.rst

@@ -193,8 +193,3 @@ occurrence of the ``%service_id%`` placeholder in your template.
 For service decorators (see above), if the definition does not modify the
 deprecated status, it will inherit the status from the definition that is
 decorated.
-
-.. caution::
-
-    The ability to "un-deprecate" a service is possible only when declaring the
-    definition in PHP.

testing.rst

@@ -495,7 +495,7 @@ afterwards with the ``followRedirect()`` method::
     $crawler = $client->followRedirect();
 
 If you want the client to automatically follow all redirects, you can
-force him with the ``followRedirects()`` method::
+force them by calling the ``followRedirects()`` method before performing the request::
 
     $client->followRedirects();