Merge branch '4.2'

* 4.2:
  [OptionsResolver] Updated some example code to use modern PHP
  Fixed the highlighting of some form Twig code examples
  Replace Controller with AbstractController
  [#10995] fix some minor typos
  [Diversity] Reword Diversity Guidance Team Language

Author: javiereguiluz

components/options_resolver.rst

@@ -36,7 +36,7 @@ Imagine you have a ``Mailer`` class which has four options: ``host``,
         }
     }
 
-When accessing the ``$options``, you need to add a lot of boilerplate code to
+When accessing the ``$options``, you need to add some boilerplate code to
 check which options are set::
 
     class Mailer
@@ -46,29 +46,17 @@ check which options are set::
         {
             $mail = ...;
 
-            $mail->setHost(isset($this->options['host'])
-                ? $this->options['host']
-                : 'smtp.example.org');
-
-            $mail->setUsername(isset($this->options['username'])
-                ? $this->options['username']
-                : 'user');
-
-            $mail->setPassword(isset($this->options['password'])
-                ? $this->options['password']
-                : 'pa$$word');
-
-            $mail->setPort(isset($this->options['port'])
-                ? $this->options['port']
-                : 25);
+            $mail->setHost($this->options['host'] ?? 'smtp.example.org');
+            $mail->setUsername($this->options['username'] ?? 'user');
+            $mail->setPassword($this->options['password'] ?? 'pa$$word');
+            $mail->setPort($this->options['port'] ?? 25);
 
             // ...
         }
     }
 
-This boilerplate is hard to read and repetitive. Also, the default values of the
-options are buried in the business logic of your code. Use the
-:phpfunction:`array_replace` to fix that::
+Also, the default values of the options are buried in the business logic of your
+code. Use the :phpfunction:`array_replace` to fix that::
 
     class Mailer
     {

contributing/diversity/governance.rst

@@ -13,9 +13,9 @@ Guidance
 --------
 
 The project leader, Fabien Potencier, is responsible for publicly appointing
-five (5) key players of the initiative to provide guidance and drive it forward,
-but also retains the right to revoke any of the key players at any time. These
-guiding key players should:
+five (5) members of the initiative to provide guidance and drive it forward,
+but also retains the right to revoke any of the appointed members at any time.
+This guidance team should:
 
 * Be committed to the initiative's cause and have joined because they want to
   help the initiative to deliver its purpose most effectively for the
@@ -37,17 +37,17 @@ Veto
 ~~~~
 
 The project leader (Fabien Potencier) will have the right to veto any actionable
-item, regardless of the vote of the initiative's key players. The project leader
-may, at their discretion, also appoint other people from among the initiative's
-key players to also have the right to veto - in such a case these people are
-expected to use appropriate judgement to know when to use a "no" vote or a veto.
-Any single veto will reject an actionable item.
+item, regardless of the vote of the initiative's guidance team. The project
+leader may, at their discretion, also appoint other people from among the
+initiative's guidance team to also have the right to veto - in such a case these
+people are expected to use appropriate judgement to know when to use a "no" vote
+or a veto. Any single veto will reject an actionable item.
 
 The purpose of having members with the right to veto is to prevent a "people's
 majority" from overruling the core interests of the Symfony project. This will
-encourage communication between proposing members, the initiative's key players
-and the Core Team to create realistic proposals, and in return any veto will
-come with a full explanation (not just a justification).
+encourage communication between proposing members, the initiative's guidance
+team and the Core Team to create realistic proposals, and in return any veto
+will come with a full explanation (not just a justification).
 
 Advice Process
 ~~~~~~~~~~~~~~
@@ -57,67 +57,67 @@ the community (advice, general consensus, or non-binding poll) should be
 requested from the wider community - this will aim to include both those who
 will be meaningfully affected and those with meaningful expertise in the matter
 at hand.
-This feedback will enable the key players to have the confidence to vote for the
-best possible decision according to the information they have available, knowing
-that the responsibility they accept for said vote is justified.
+This feedback will enable the guidance team to have the confidence to vote for
+the best possible decision according to the information they have available,
+knowing that the responsibility they accept for said vote is justified.
 
 Voting
 ~~~~~~
 
-Key players have the right to vote on proposals for actionable items.
+The guidance team have the right to vote on proposals for actionable items.
 The quorum of "yes" or "no" votes required for a decision to be considered valid
-is at least 75% of active, appointed key players - to abstain from voting means
-that vote will not be counted towards the quorum.
-For an actionable item to pass, approval from greater than 50% of the voting key
-players is required. Use or management of finances/donations require at least a
-two-thirds majority to pass.
+is at least 75% of active, appointed members of the guidance team - to abstain
+from voting means that vote will not be counted towards the quorum.
+For an actionable item to pass, approval from greater than 50% of the voting
+guidance team members is required. Use or management of finances/donations
+require at least a two-thirds majority to pass.
 
 Guidance Principles
 -------------------
 
 Purpose
 ~~~~~~~
 
-The initiative should be led by an effective team of key players that provide
+The initiative should be led by an effective guidance team that provides
 strategic guidance in line with the initiative's aims and values, including a
-shared understanding with fellow key players to ensure that these are being
-delivered effectively and sustainably.
+shared understanding with fellow initiative members to ensure that these are
+being delivered effectively and sustainably.
 
 Integrity
 ~~~~~~~~~
 
-Key players should act with integrity: adopting values which help achieve the
-initiative's purposes, even where difficult or unpopular decisions are required.
-Key players should undertake their duties, aware of the importance of confidence
-and trust in the initiative from the wider community, and ultimately
-acknowledges shared responsibility for the reputation of the Symfony project
-like the Core Team.
+The guidance team should act with integrity: adopting values which help achieve
+the initiative's purposes, even where difficult or unpopular decisions are
+required. Guidance team members should undertake their duties, aware of the
+importance of confidence and trust in the initiative from the wider community,
+and ultimately acknowledges shared responsibility for the reputation of the
+Symfony project like the Core Team.
 
 Decision-making Effectiveness
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Key players should work as an effective team, using the appropriate balance of
-skills, experience, backgrounds and knowledge to make sure its decision-making
-processes are informed and equitable. Risk assessment and management systems
-should be set up and monitored.
+Guidance members should work as an effective team, using the appropriate balance
+of skills, experience, backgrounds and knowledge to make sure its
+decision-making processes are informed and equitable. Risk assessment and
+management systems should be set up and monitored.
 
 Openness and Accountability
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The behaviour and conduct of the initiative's key players sets the tone for the
-rest of the community. Key players should lead by example to create a culture
-that enables members to feel it is safe to suggest, question and challenge -
-rather than avoid - difficult ideas and topics. Key players guide the initiative
-in being transparent, accountable and open.
+The behaviour and conduct of the initiative's guidance team sets the tone for
+the rest of the community. The guidance team should lead by example to create a
+culture that enables members to feel it is safe to suggest, question and
+challenge - rather than avoid - difficult ideas and topics. The team should
+guide the initiative in being transparent, accountable and open.
 
 Adaptability
 ~~~~~~~~~~~~
 
 The initiative should establish processes that do not require any one person to
 hold specific positions while being adaptable to accommodate unforeseen needs of
 the community, especially as membership and involvement grows over time (changes
-to key player appointment will have to be approved by the current system, which
-is Fabien Potencier).
+to guidance team member appointment will have to be approved by the current
+system, which is Fabien Potencier).
 
 .. _`lsmith77`: https://github.com/lsmith77/
 .. _`michellesanver`: https://github.com/michellesanver/

doctrine/registration_form.rst

@@ -96,7 +96,7 @@ The form class for the registration form will look something like this::
                         new Length([
                             'min' => 6,
                             'minMessage' => 'Your password should be at least {{ limit }} characters',
-                            'max' => 4096
+                            'max' => 4096,
                         ]),
                     ],
                 ])
@@ -170,7 +170,7 @@ saves the user::
 
                 // do anything else you need here, like send an email
 
-                return $this->redirect('app_homepage');
+                return $this->redirectToRoute('app_homepage');
             }
 
             return $this->render('registration/register.html.twig', [
@@ -223,13 +223,13 @@ To do this, add a ``termsAccepted`` field to your form, but set its
         public function buildForm(FormBuilderInterface $builder, array $options)
         {
             $builder
-                ->add('email', EmailType::class);
+                ->add('email', EmailType::class)
                 // ...
                 ->add('termsAccepted', CheckboxType::class, [
                     'mapped' => false,
                     'constraints' => new IsTrue(),
                 ])
-            );
+            ;
         }
     }
 

form/action_method.rst

@@ -117,7 +117,7 @@ options:
 Finally, you can override the action and method in the template by passing them
 to the ``form()`` or the ``form_start()`` helper functions:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {# templates/default/new.html.twig #}
     {{ form_start(form, {'action': path('target_route'), 'method': 'GET'}) }}

form/bootstrap4.rst

@@ -95,7 +95,7 @@ Bootstrap 4 has a feature called "`custom forms`_". You can enable that on your
 Symfony Form ``RadioType`` and ``CheckboxType`` by adding a class called ``radio-custom``
 and ``checkbox-custom`` respectively.
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {{ form_row(form.myRadio, {label_attr: {class: 'radio-custom'} }) }}
     {{ form_row(form.myCheckbox, {label_attr: {class: 'checkbox-custom'} }) }}

form/form_collections.rst

@@ -295,7 +295,7 @@ new "tag" forms. To render it, make the following change to your template:
     on it. You could even choose to render only one of its fields (e.g. the
     ``name`` field):
 
-    .. code-block:: html+twig
+    .. code-block:: twig
 
         {{ form_widget(form.tags.vars.prototype.name)|e }}
 

form/form_customization.rst

@@ -86,7 +86,7 @@ Some of the Twig functions mentioned in the previous section allow to pass
 variables to configure their behavior. For example, the ``form_label()``
 function lets you define a custom label to override the one defined in the form:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {{ form_label(form.task, 'My Custom Task Label') }}
 
@@ -96,7 +96,7 @@ type, but one common option is ``attr``, which allows you to modify HTML
 attributes on the form element. The following would add the ``task_field`` CSS
 class to the rendered input text field:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {{ form_widget(form.task, {'attr': {'class': 'task_field'}}) }}
 
@@ -116,7 +116,7 @@ If you need to render form fields "by hand" then you can access individual
 values for fields (such as the ``id``, ``name`` and ``label``) using its
 ``vars``  property. For example to get the ``id``:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {{ form.task.vars.id }}
 

form/form_themes.rst

@@ -102,7 +102,7 @@ Although most of the times you'll apply form themes globally, you may need to
 apply a theme only to some specific form. You can do that with the
 :ref:`form_theme Twig tag <reference-twig-tag-form-theme>`:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {# this form theme will be applied only to the form of this template #}
     {% form_theme form 'foundation_5_layout.html.twig' %}
@@ -137,7 +137,7 @@ Applying Different Themes to Child Forms
 
 You can also apply a form theme to a specific child of your form:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {% form_theme form.a_child_form 'form/my_custom_theme.html.twig' %}
 
@@ -161,7 +161,7 @@ can be installed on different Symfony apps (and so you can't control what themes
 are enabled globally). To do that, add the ``only`` keyword after the list of
 form themes:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {% form_theme form with ['foundation_5_layout.html.twig'] only %}
 
@@ -175,7 +175,7 @@ form themes:
     yourself, or extend one of the built-in form themes with Twig's ``use``
     keyword instead of ``extends`` to re-use the original theme contents.
 
-    .. code-block:: html+twig
+    .. code-block:: twig
 
         {# templates/form/common.html.twig #}
         {% use "form_div_layout.html.twig" %}
@@ -192,7 +192,7 @@ with one or more of those blocks that you want to use when rendering a form.
 Consider for example a form field that represents an integer property called
 ``age``. If you add this to the template:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {{ form_widget(form.age) }}
 
@@ -377,7 +377,7 @@ rules to know which Twig blocks to define.
 For example, if your form theme is simple and you only want to override the
 ``<input type="integer">`` elements, create this template:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {# templates/form/my_theme.html.twig #}
     {% block integer_widget %}
@@ -429,7 +429,7 @@ you want to apply the theme globally to all forms, define the
 
 If you only want to apply it to some specific forms, use the ``form_theme`` tag:
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {% form_theme form 'form/my_theme.html.twig' %}
 
@@ -453,7 +453,7 @@ built-in themes using the `Twig "use" tag`_ instead of the ``extends`` tag so
 you can inherit all its blocks (if you are unsure, extend from the default
 ``form_div_layout.html.twig`` theme):
 
-.. code-block:: html+twig
+.. code-block:: twig
 
     {# templates/form/my_theme.html.twig #}
     {% use 'form_div_layout.html.twig' %}

security/user_provider.rst

@@ -109,8 +109,8 @@ to retrieve them:
         ]);
 
 The ``providers`` section creates a "user provider" called ``users`` that knows
-to query from your ``App\Entity\User`` entity by the ``username`` property. You
-can choose any name for the user provider, but it's recommended to pick a
+how to query from your ``App\Entity\User`` entity by the ``username`` property.
+You can choose any name for the user provider, but it's recommended to pick a
 descriptive name because this will be later used in the firewall configuration.
 
 .. _authenticating-someone-with-a-custom-entity-provider:
@@ -208,7 +208,7 @@ Memory User Provider
 --------------------
 
 It's not recommended to use this provider in real applications because of its
-limitations and how difficult is to manage users. It may be useful in app
+limitations and how difficult it is to manage users. It may be useful in app
 prototypes and for limited apps that don't store users in databases.
 
 This user provider stores all user information in a configuration file,

service_container.rst

@@ -534,11 +534,11 @@ You can also fetch parameters directly from the container::
     {
         // ...
 
-        // this ONLY works if you extend the base Controller
-        $adminEmail = $this->container->getParameter('admin_email');
+        // this shortcut ONLY works if you extend the base AbstractController
+        $adminEmail = $this->getParameter('admin_email');
 
-        // or a shorter way!
-        // $adminEmail = $this->getParameter('admin_email');
+        // this is the equivalent code of the previous shortcut:
+        // $adminEmail = $this->container->get('parameter_bag')->get('admin_email');
     }
 
 For more info about parameters, see :doc:`/service_container/parameters`.