Skip to content

Commit 83c9773

Browse files
committed
Merge branch '4.4'
* 4.4: Fixes typo in routing. Renamed the security:check command as check:security
2 parents 3eb8bca + 20a732e commit 83c9773

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

contributing/code/security.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ confirmed, the core team works on a solution following these steps:
3838
#. Publish the post on the official Symfony `blog`_ (it must also be added to
3939
the "`Security Advisories`_" category);
4040
#. Update the public `security advisories database`_ maintained by the
41-
FriendsOfPHP organization and which is used by the ``security:check`` command.
41+
FriendsOfPHP organization and which is used by
42+
:doc:`the check:security command </security/security_checker>`.
4243

4344
.. note::
4445

@@ -169,7 +170,7 @@ Security Advisories
169170
.. tip::
170171

171172
You can check your Symfony application for known security vulnerabilities
172-
using :ref:`the security:check command <security-checker>`.
173+
using :ref:`the check:security command <security-checker>`.
173174

174175
Check the `Security Advisories`_ blog category for a list of all security
175176
vulnerabilities that were fixed in Symfony releases, starting from Symfony

routing.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ arbitrary matching logic:
281281
282282
The value of the ``condition`` option is any valid
283283
:doc:`ExpressionLanguage expression </components/expression_language/syntax>`
284-
and can use and of these variables created by Symfony:
284+
and can use any of these variables created by Symfony:
285285

286286
``context``
287287
An instance of :class:`Symfony\\Component\\Routing\\RequestContext`,

setup.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ vulnerability:
180180

181181
.. code-block:: terminal
182182
183-
$ symfony security:check
183+
$ symfony check:security
184184
185185
A good security practice is to execute this command regularly to be able to
186186
update or replace compromised dependencies as soon as possible. The security
@@ -189,7 +189,7 @@ so your ``composer.lock`` file is not sent on the network.
189189

190190
.. tip::
191191

192-
The ``security:check`` command terminates with a non-zero exit code if
192+
The ``check:security`` command terminates with a non-zero exit code if
193193
any of your dependencies is affected by a known security vulnerability.
194194
This way you can add it to your project build process and your continuous
195195
integration workflows to make them fail when there are vulnerabilities.

0 commit comments

Comments
 (0)