Skip to content

Commit b139eab

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Remove more outdated contents Remove `Build the Documentation Locally` Remove ambiguous usage of multiple roles in access_control Partially revert "fix voting on multiple roles behavior description" due to CVE-2020-5275 Warn about the _token field added automatically
2 parents 356ae6a + 37b7ac3 commit b139eab

File tree

4 files changed

+17
-60
lines changed

4 files changed

+17
-60
lines changed
Binary file not shown.

contributing/documentation/overview.rst

Lines changed: 6 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -229,61 +229,12 @@ this hard work, it's **time to celebrate again!**
229229
Review your changes
230230
-------------------
231231

232-
Every GitHub Pull Request is automatically built and deployed by
233-
`SymfonyCloud`_ on a single environment that you can access on your browser to
234-
review your changes.
232+
Symfony repository checks every Pull Request automatically to look for common
233+
errors, inappropriate words, syntax issues in code blocks, etc.
235234

236-
.. image:: /_images/contributing/docs-pull-request-symfonycloud.png
237-
:align: center
238-
:alt: SymfonyCloud Pull Request Deployment
239-
240-
To access the `SymfonyCloud`_ environment URL, go to your Pull Request page on
241-
GitHub, click on the **Show all checks** link and finally, click on the
242-
``Details`` link displayed for SymfonyCloud service.
243-
244-
.. note::
245-
246-
Only Pull Requests to maintained branches are automatically built by
247-
SymfonyCloud. Check the `roadmap`_ for maintained branches.
248-
249-
Build the Documentation Locally
250-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
251-
252-
If you have Docker installed on your machine, run these commands to build the
253-
docs:
254-
255-
.. code-block:: terminal
256-
257-
# build the image...
258-
$ docker build . -t symfony-docs
259-
260-
# ...and start the local web server
261-
# (if it's already in use, change the '8080' port by any other port)
262-
$ docker run --rm -p 8080:80 symfony-docs
263-
264-
You can now read the docs at ``http://127.0.0.1:8080`` (if you use a virtual
265-
machine, browse its IP instead of localhost; e.g. ``http://192.168.99.100:8080``).
266-
267-
If you don't use Docker, follow these steps to build the docs locally:
268-
269-
#. Install `pip`_ as explained in the `pip installation`_ article;
270-
271-
#. Install `Sphinx`_ and `Sphinx Extensions for PHP and Symfony`_
272-
(depending on your system, you may need to execute this command as root user):
273-
274-
.. code-block:: terminal
275-
276-
$ cd _build/
277-
$ pip install -r .requirements.txt
278-
279-
#. Run the following command to build the documentation in HTML format:
280-
281-
.. code-block:: terminal
282-
283-
$ cd _build/
284-
$ make html
285-
286-
The generated documentation is available in the ``_build/html`` directory.
235+
Optionally you can also build the docs in your local machine to debug issues or
236+
to read the documentation offline. To do so, follow the instructions included in
237+
`the README file of symfony-docs repository`_.
287238

288239
Frequently Asked Questions
289240
--------------------------
@@ -342,7 +293,4 @@ definitely don't want you to waste your time!
342293
.. _`Symfony Documentation Badge`: https://connect.symfony.com/badge/36/symfony-documentation-contributor
343294
.. _`SymfonyCloud`: https://symfony.com/cloud
344295
.. _`roadmap`: https://symfony.com/releases
345-
.. _`pip`: https://pip.pypa.io/en/stable/
346-
.. _`pip installation`: https://pip.pypa.io/en/stable/installing/
347-
.. _`Sphinx`: https://www.sphinx-doc.org/
348-
.. _`Sphinx Extensions for PHP and Symfony`: https://github.com/fabpot/sphinx-php
296+
.. _`the README file of symfony-docs repository`: https://github.com/symfony/symfony-docs#readme

form/form_customization.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,16 @@ control over how each form field is rendered, so you can fully customize them:
7575
</div>
7676
</div>
7777

78+
.. caution::
79+
80+
If you're rendering each field manually, make sure you don't forget the
81+
``_token`` field that is automatically added for CSRF protection.
82+
83+
You can also use ``{{ form_rest(form) }}`` (recommended) to render any
84+
fields that aren't rendered manually. See
85+
:ref:`the form_rest() documentation <reference-forms-twig-rest>` below for
86+
more information.
87+
7888
.. note::
7989

8090
Later in this article you can find the full reference of these Twig

security/access_control.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@ options:
181181

182182
* ``roles`` If the user does not have the given role, then access is denied
183183
(internally, an :class:`Symfony\\Component\\Security\\Core\\Exception\\AccessDeniedException`
184-
is thrown). If this value is an array of multiple roles, the user must have
185-
at least one of them.
184+
is thrown).
186185

187186
* ``allow_if`` If the expression returns false, then access is denied;
188187

0 commit comments

Comments
 (0)