Skip to content

Commit 9fee9ee

Browse files
committed
bug #4746 Revert #4651 for 2.3 branch (xelaris)
This PR was merged into the 2.3 branch. Discussion ---------- Revert #4651 for 2.3 branch | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | 2.3 (only) | Fixed tickets | #4651 was merged in 2.3 but should be 2.5 as mentioned in #4651 (comment). This PR reverts the changes for the 2.3 branch. Commits ------- f2d3223 Revert #4651 for 2.3 branch
2 parents 528e8e1 + f2d3223 commit 9fee9ee

File tree

3 files changed

+0
-49
lines changed

3 files changed

+0
-49
lines changed

book/installation.rst

-12
Original file line numberDiff line numberDiff line change
@@ -288,18 +288,6 @@ them all at once:
288288
Depending on the complexity of your project, this update process can take up to
289289
several minutes to complete.
290290

291-
.. tip::
292-
293-
Symfony provides a command to check whether your project's dependencies
294-
contain any know security vulnerability:
295-
296-
.. code-block:: bash
297-
298-
$ php app/console security:check
299-
300-
A good security practice is to execute this command regularly to be able to
301-
update or replace compromised dependencies as soon as possible.
302-
303291
.. _installing-a-symfony2-distribution:
304292

305293
Installing a Symfony Distribution

book/security.rst

-29
Original file line numberDiff line numberDiff line change
@@ -1234,34 +1234,6 @@ cookie will be ever created by Symfony):
12341234

12351235
.. _book-security-checking-vulnerabilities:
12361236

1237-
Checking for Known Security Vulnerabilities in Dependencies
1238-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1239-
1240-
.. versionadded:: 2.5
1241-
The ``security:check`` command was introduced in Symfony 2.5. This command is
1242-
included in ``SensioDistributionBundle``, which has to be registered in your
1243-
application in order to use this command.
1244-
1245-
When using lots of dependencies in your Symfony projects, some of them may
1246-
contain security vulnerabilities. That's why Symfony includes a command called
1247-
``security:check`` that checks your ``composer.lock`` file to find any known
1248-
security vulnerability in your installed dependencies:
1249-
1250-
.. code-block:: bash
1251-
1252-
$ php app/console security:check
1253-
1254-
A good security practice is to execute this command regularly to be able to
1255-
update or replace compromised dependencies as soon as possible. Internally,
1256-
this command uses the public `security advisories database`_ published by the
1257-
FriendsOfPHP organization.
1258-
1259-
.. tip::
1260-
1261-
The ``security:check`` command terminates with a non-zero exit code if
1262-
any of your dependencies is affected by a known security vulnerability.
1263-
Therefore, you can easily integrate it in your build process.
1264-
12651237
Final Words
12661238
-----------
12671239

@@ -1290,4 +1262,3 @@ Learn more from the Cookbook
12901262

12911263
.. _`online tool`: https://www.dailycred.com/blog/12/bcrypt-calculator
12921264
.. _`frameworkextrabundle documentation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
1293-
.. _`security advisories database`: https://github.com/FriendsOfPHP/security-advisories

contributing/code/security.rst

-8
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ 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 security advisory list (see below).
41-
#. Update the public `security advisories database`_ maintained by the
42-
FriendsOfPHP organization and which is used by the ``security:check`` command.
4341

4442
.. note::
4543

@@ -95,11 +93,6 @@ of the downstream projects included in this process:
9593
Security Advisories
9694
-------------------
9795

98-
.. tip::
99-
100-
You can check your Symfony application for known security vulnerabilities
101-
using the ``security:check`` command. See :ref:`book-security-checking-vulnerabilities`.
102-
10396
This section indexes security vulnerabilities that were fixed in Symfony
10497
releases, starting from Symfony 1.0.0:
10598

@@ -129,4 +122,3 @@ releases, starting from Symfony 1.0.0:
129122
.. _Git repository: https://github.com/symfony/symfony
130123
.. _blog: http://symfony.com/blog/
131124
.. _Security Advisories: http://symfony.com/blog/category/security-advisories
132-
.. _`security advisories database`: https://github.com/FriendsOfPHP/security-advisories

0 commit comments

Comments
 (0)