Skip to content

Fixed some misc issues #11109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 8, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions best_practices/security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ be reused in other parts of the application. Imagine that you want to add
a link in a template that will only be seen by authors. Right now you'll
need to repeat the expression code using Twig syntax:

.. code-block:: html+jinja
.. code-block:: html+twig

{% if app.user and app.user.email == post.authorEmail %}
<a href=""> ... </a>
Expand Down Expand Up @@ -202,7 +202,7 @@ Now you can reuse this method both in the template and in the security expressio
// ...
}

.. code-block:: html+jinja
.. code-block:: html+twig

{% if post.isAuthor(app.user) %}
<a href=""> ... </a>
Expand Down
2 changes: 1 addition & 1 deletion components/serializer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ There are several types of normalizers available:
calling the constructor during the denormalization process.

Objects are normalized to a map of property names and values (names are
generated removing the ``get``, ``set``, ``has`` or ``remove`` prefix from
generated removing the ``get``, ``set``, ``has``, ``is`` or ``remove`` prefix from
the method name and lowercasing the first letter; e.g. ``getFirstName()`` ->
``firstName``).

Expand Down
2 changes: 1 addition & 1 deletion email.rst
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ To keep things decoupled, the email body has been stored in a template and
rendered with the ``renderView()`` method. The ``registration.html.twig``
template might look something like this:

.. code-block:: html+jinja
.. code-block:: html+twig

{# app/Resources/views/Emails/registration.html.twig #}
<h3>You did it! You registered!</h3>
Expand Down
2 changes: 1 addition & 1 deletion form/create_custom_field_type.rst
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ link for details), create a ``shipping_widget`` block to handle this:

You can further customize the template used to render each children of the
choice type. The block to override in that case is named "block name" +
``_entry`` + "element name" (``label``, ``errors`` or ``widget``) (e.g. to
``_entry_`` + "element name" (``label``, ``errors`` or ``widget``) (e.g. to
customize the labels of the children of the Shipping widget you'd need to
define ``{% block shipping_entry_label %} ... {% endblock %}``).

Expand Down
2 changes: 1 addition & 1 deletion reference/configuration/framework.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1973,7 +1973,7 @@ ships with multiple adapters: ``cache.adapter.apcu``, ``cache.adapter.doctrine``
given the adapter they are based on. Internally, a pool wraps the definition
of an adapter.

.. _reference-cache-systen:
.. _reference-cache-system:

system
......
Expand Down
2 changes: 1 addition & 1 deletion security.rst
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@ You can also use expressions inside your templates:

.. configuration-block::

.. code-block:: html+jinja
.. code-block:: html+twig

{% if is_granted(expression(
'"ROLE_ADMIN" in roles or (not is_anonymous() and user.isSuperAdmin())'
Expand Down
2 changes: 1 addition & 1 deletion serializer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ Enabling the Metadata Cache

Metadata used by the Serializer component such as groups can be cached to
enhance application performance. By default, the serializer uses the ``cache.system``
cache pool which is configured using the :ref:`cache.system <reference-cache-systen>`
cache pool which is configured using the :ref:`cache.system <reference-cache-system>`
option.

Enabling a Name Converter
Expand Down
2 changes: 1 addition & 1 deletion templating.rst
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ being used and generating the correct paths accordingly.
If you need absolute URLs for assets, use the ``absolute_url()`` Twig function
as follows:

.. code-block:: html+jinja
.. code-block:: html+twig

<img src="{{ absolute_url(asset('images/logo.png')) }}" alt="Symfony!" />

Expand Down
2 changes: 1 addition & 1 deletion validation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ message:

.. code-block:: text

AppBundle\Entity\Author.name:
Object(AppBundle\Entity\Author).name:
This value should not be blank

If you insert a value into the ``name`` property, the happy success message
Expand Down
2 changes: 1 addition & 1 deletion validation/severity.rst
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ method. Each constraint exposes the attached payload as a public property::
For example, you can leverage this to customize the ``form_errors`` block
so that the severity is added as an additional HTML class:

.. code-block:: html+jinja
.. code-block:: html+twig

{%- block form_errors -%}
{%- if errors|length > 0 -%}
Expand Down