From 8a15b64063a83b3b3a1560edc067f2ed59e659e2 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 24 Feb 2025 15:18:40 +0100 Subject: [PATCH 1/4] Move the core team page to the contributing root dir as it's not just about code --- _build/redirection_map | 1 + _images/sources/README.md | 2 +- contributing/code/index.rst | 1 - contributing/code/pull_requests.rst | 2 +- contributing/code/standards.rst | 2 +- contributing/code_of_conduct/care_team.rst | 2 +- contributing/community/releases.rst | 2 +- contributing/{code => }/core_team.rst | 0 contributing/map.rst.inc | 3 ++- 9 files changed, 8 insertions(+), 7 deletions(-) rename contributing/{code => }/core_team.rst (100%) diff --git a/_build/redirection_map b/_build/redirection_map index 4fb14724d26..3bad633e0e1 100644 --- a/_build/redirection_map +++ b/_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 diff --git a/_images/sources/README.md b/_images/sources/README.md index 467d4024010..84810a9783d 100644 --- a/_images/sources/README.md +++ b/_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/ diff --git a/contributing/code/index.rst b/contributing/code/index.rst index e537eb3a0c3..b4cf85441b0 100644 --- a/contributing/code/index.rst +++ b/contributing/code/index.rst @@ -9,7 +9,6 @@ Contributing Code reproducer pull_requests maintenance - core_team security tests bc diff --git a/contributing/code/pull_requests.rst b/contributing/code/pull_requests.rst index 7b51b2ab3cb..548fc6c190c 100644 --- a/contributing/code/pull_requests.rst +++ b/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 `. -The :doc:`core team ` is responsible for deciding +The :doc:`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. diff --git a/contributing/code/standards.rst b/contributing/code/standards.rst index ced2568c5f7..3a00343faf1 100644 --- a/contributing/code/standards.rst +++ b/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 `. + removed per request to the :doc:`core team `. License ~~~~~~~ diff --git a/contributing/code_of_conduct/care_team.rst b/contributing/code_of_conduct/care_team.rst index e061c0a0afe..1b15850da39 100644 --- a/contributing/code_of_conduct/care_team.rst +++ b/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 ` appoints the CARE +The :doc:`Symfony project leader ` 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. diff --git a/contributing/community/releases.rst b/contributing/community/releases.rst index 8126496bfef..2c5a796e9b5 100644 --- a/contributing/community/releases.rst +++ b/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 ` and documented as +amongst the :doc:`core team ` and documented as part of the :ref:`technical requirements for running Symfony applications `. diff --git a/contributing/code/core_team.rst b/contributing/core_team.rst similarity index 100% rename from contributing/code/core_team.rst rename to contributing/core_team.rst diff --git a/contributing/map.rst.inc b/contributing/map.rst.inc index 92bc1e2e142..acbb24bb9b0 100644 --- a/contributing/map.rst.inc +++ b/contributing/map.rst.inc @@ -1,3 +1,5 @@ +* :doc:`The Core Team ` + * **Code of Conduct** * :doc:`/contributing/code_of_conduct/code_of_conduct` @@ -12,7 +14,6 @@ * :doc:`Pull Requests ` * :doc:`Reviewing Issues and Pull Requests ` * :doc:`Maintenance ` - * :doc:`The Core Team ` * :doc:`Security ` * :doc:`Tests ` * :doc:`Backward Compatibility ` From 4e52d442208eb2efd33f57f14d27d09713dacf82 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 24 Feb 2025 15:17:14 +0100 Subject: [PATCH 2/4] Add new core team members --- contributing/core_team.rst | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/contributing/core_team.rst b/contributing/core_team.rst index 2afae903d92..d461aa44485 100644 --- a/contributing/core_team.rst +++ b/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/ From a78f065f1d8e999cc3d96dcf5c29a7eed85399f0 Mon Sep 17 00:00:00 2001 From: super-omario Date: Thu, 20 Feb 2025 20:43:09 +0100 Subject: [PATCH 3/4] [Console] Fix argument position for addOption --- console/input.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console/input.rst b/console/input.rst index 5ec9cf3ae04..3a37704df23 100644 --- a/console/input.rst +++ b/console/input.rst @@ -320,7 +320,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; From d232cccd6b56def4db372acbb11d371ae7171bf2 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 25 Feb 2025 09:11:51 +0100 Subject: [PATCH 4/4] Minor tweak --- console/input.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console/input.rst b/console/input.rst index 3a37704df23..813ab683428 100644 --- a/console/input.rst +++ b/console/input.rst @@ -320,7 +320,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()`` or the 6th argument of ``addOption``:: +To achieve this, use the 5th argument of ``addArgument()`` or the 6th argument of ``addOption()``:: // ... use Symfony\Component\Console\Completion\CompletionInput;