Merge branch '6.4' into 7.2

* 6.4:
  Minor tweak
  [Console] Fix argument position for addOption
  Add new core team members
  Move the core team page to the contributing root dir as it's not just about code

Author: javiereguiluz

_build/redirection_map

@@ -430,6 +430,7 @@
 /email/spool /mailer
 /email/testing /mailer
 /contributing/community/other /contributing/community
+/contributing/code/core_team /contributing/core_team
 /profiler/storage /profiler
 /setup/composer /setup
 /security/security_checker /setup

_images/sources/README.md

@@ -96,7 +96,7 @@ only the asciicast file).
 
 [1]: http://dia-installer.de/
 [2]: https://fonts.google.com/specimen/PT+Sans+Narrow
-[3]: https://symfony.com/doc/current/contributing/code/core_team.html
+[3]: https://symfony.com/doc/current/contributing/core_team.html
 [4]: https://github.com/asciinema/asciinema
 [5]: https://github.com/asciinema/agg
 [6]: https://www.jetbrains.com/lp/mono/

console/input.rst

@@ -356,7 +356,7 @@ can also implement value completion for the input in your commands. For
 instance, you may want to complete all usernames from the database in the
 ``name`` argument of your greet command.
 
-To achieve this, use the 5th argument of ``addArgument()``/``addOption``::
+To achieve this, use the 5th argument of ``addArgument()`` or the 6th argument of ``addOption()``::
 
     // ...
     use Symfony\Component\Console\Completion\CompletionInput;

contributing/code/index.rst

@@ -9,7 +9,6 @@ Contributing Code
     reproducer
     pull_requests
     maintenance
-    core_team
     security
     tests
     bc

contributing/code/pull_requests.rst

@@ -404,7 +404,7 @@ perspective, please join the ``#contribs`` channel on `Symfony Slack`_. If you
 receive feedback you find abusive please contact the
 :doc:`CARE team </contributing/code_of_conduct/care_team>`.
 
-The :doc:`core team </contributing/code/core_team>` is responsible for deciding
+The :doc:`core team </contributing/core_team>` is responsible for deciding
 which PR gets merged, so their feedback is the most relevant. So do not feel
 pressured to refactor your code immediately when someone provides feedback.
 

contributing/code/standards.rst

@@ -300,7 +300,7 @@ Documentation
 * When adding a new class or when making significant changes to an existing class,
   an ``@author`` tag with personal contact information may be added, or expanded.
   Please note it is possible to have the personal contact information updated or
-  removed per request to the :doc:`core team </contributing/code/core_team>`.
+  removed per request to the :doc:`core team </contributing/core_team>`.
 
 License
 ~~~~~~~

contributing/code_of_conduct/care_team.rst

@@ -54,7 +54,7 @@ also contact all of them at once by emailing ** care@symfony.com **.
 About the CARE Team
 -------------------
 
-The :doc:`Symfony project leader </contributing/code/core_team>` appoints the CARE
+The :doc:`Symfony project leader </contributing/core_team>` appoints the CARE
 team with candidates they see fit. The CARE team will consist of at least
 3 people. The team should be representing as many demographics as possible,
 ideally from different employers.

contributing/community/releases.rst

@@ -113,7 +113,7 @@ PHP Compatibility
 -----------------
 
 The **minimum** PHP version is decided for each **major** Symfony version by consensus
-amongst the :doc:`core team </contributing/code/core_team>` and documented as
+amongst the :doc:`core team </contributing/core_team>` and documented as
 part of the :ref:`technical requirements for running Symfony applications
 <symfony-tech-requirements>`.
 

contributing/code/core_team.rst renamed to contributing/core_team.rst

@@ -82,7 +82,11 @@ Active Core Members
   * **Oskar Stark** (`OskarStark`_);
   * **Mathieu Santostefano** (`welcomattic`_);
   * **Kevin Bond** (`kbond`_);
-  * **Jérôme Tamarelle** (`gromnan`_).
+  * **Jérôme Tamarelle** (`gromnan`_);
+  * **Berislav Balogović** (`hypemc`_);
+  * **Mathias Arlaud** (`mtarld`_);
+  * **Florent Morselli** (`spomky`_);
+  * **Alexandre Daubois** (`alexandre-daubois`_).
 
 * **Security Team** (``@symfony/security`` on GitHub):
 
@@ -255,3 +259,7 @@ discretion of the **Project Leader**.
 .. _`smnandre`: https://github.com/smnandre/
 .. _`kocal`: https://github.com/kocal/
 .. _`webmamba`: https://github.com/webmamba/
+.. _`hypemc`: https://github.com/hypemc/
+.. _`mtarld`: https://github.com/mtarld/
+.. _`spomky`: https://github.com/spomky/
+.. _`alexandre-daubois`: https://github.com/alexandre-daubois/

contributing/map.rst.inc

@@ -1,3 +1,5 @@
+* :doc:`The Core Team </contributing/core_team>`
+
 * **Code of Conduct**
 
   * :doc:`/contributing/code_of_conduct/code_of_conduct`
@@ -12,7 +14,6 @@
   * :doc:`Pull Requests </contributing/code/pull_requests>`
   * :doc:`Reviewing Issues and Pull Requests </contributing/community/reviews>`
   * :doc:`Maintenance </contributing/code/maintenance>`
-  * :doc:`The Core Team </contributing/code/core_team>`
   * :doc:`Security </contributing/code/security>`
   * :doc:`Tests </contributing/code/tests>`
   * :doc:`Backward Compatibility </contributing/code/bc>`