Skip to content

Commit e559074

Browse files
committed
minor #11109 Fixed some misc issues (javiereguiluz)
This PR was merged into the 3.4 branch. Discussion ---------- Fixed some misc issues This replaces #10711 making only the changes that are clearly needed. Commits ------- 1b7318c Fixed some misc issues
2 parents 687d345 + 1b7318c commit e559074

File tree

10 files changed

+11
-11
lines changed

10 files changed

+11
-11
lines changed

best_practices/security.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ be reused in other parts of the application. Imagine that you want to add
160160
a link in a template that will only be seen by authors. Right now you'll
161161
need to repeat the expression code using Twig syntax:
162162

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

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

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

207207
{% if post.isAuthor(app.user) %}
208208
<a href=""> ... </a>

components/serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ There are several types of normalizers available:
578578
calling the constructor during the denormalization process.
579579

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

email.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ To keep things decoupled, the email body has been stored in a template and
138138
rendered with the ``renderView()`` method. The ``registration.html.twig``
139139
template might look something like this:
140140

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

143143
{# app/Resources/views/Emails/registration.html.twig #}
144144
<h3>You did it! You registered!</h3>

form/create_custom_field_type.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ link for details), create a ``shipping_widget`` block to handle this:
153153

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

reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1973,7 +1973,7 @@ ships with multiple adapters: ``cache.adapter.apcu``, ``cache.adapter.doctrine``
19731973
given the adapter they are based on. Internally, a pool wraps the definition
19741974
of an adapter.
19751975

1976-
.. _reference-cache-systen:
1976+
.. _reference-cache-system:
19771977

19781978
system
19791979
......

security.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ You can also use expressions inside your templates:
940940

941941
.. configuration-block::
942942

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

945945
{% if is_granted(expression(
946946
'"ROLE_ADMIN" in roles or (not is_anonymous() and user.isSuperAdmin())'

serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ Enabling the Metadata Cache
233233

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

239239
Enabling a Name Converter

templating.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@ being used and generating the correct paths accordingly.
660660
If you need absolute URLs for assets, use the ``absolute_url()`` Twig function
661661
as follows:
662662

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

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

validation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ message:
151151

152152
.. code-block:: text
153153
154-
AppBundle\Entity\Author.name:
154+
Object(AppBundle\Entity\Author).name:
155155
This value should not be blank
156156
157157
If you insert a value into the ``name`` property, the happy success message

validation/severity.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ method. Each constraint exposes the attached payload as a public property::
142142
For example, you can leverage this to customize the ``form_errors`` block
143143
so that the severity is added as an additional HTML class:
144144

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

147147
{%- block form_errors -%}
148148
{%- if errors|length > 0 -%}

0 commit comments

Comments
 (0)