8000 Minor tweaks · symfony/symfony-docs@3062a15 · GitHub
[go: up one dir, main page]

Skip to content

Commit 3062a15

Browse files
committed
Minor tweaks
1 parent 9a90511 commit 3062a15

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

reference/constraints/Expression.rst

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,8 @@ One way to accomplish this is with the Expression constraint:
139139
}
140140
141141
The :ref:`expression <reference-constraint-expression-option>` option is the
142-
expression that must return true in order for validation to pass. To learn
143-
more about the expression language syntax, see
144-
:ref:`expression-language-syntax`.
142+
expression that must return true in order for validation to pass. Learn more
143+
about the :ref:`expression language syntax <expression-language-syntax>`.
145144

146145
.. sidebar:: Mapping the Error to a Specific Field
147146

@@ -262,14 +261,10 @@ Options
262261
**type**: ``string`` [:ref:`default option <validation-default-option>`]
263262

264263
The expression that will be evaluated. If the expression evaluates to a false
265-
value (using ``==``, not ``===``), validation will fail.
264+
value (using ``==``, not ``===``), validation will fail. Learn more about the
265+
:ref:`expression language syntax <expression-language-syntax>`.
266266

267-
To learn more about the expression language syntax, see
268-
:ref:`expression-language-syntax`.
269-
270-
Inside of the expression, you have access to up to 2 variables:
271-
272-
Depending on how you use the constraint, you have access to 1 or 2 variables
267+
Depending on how you use the constraint, you have access to different variables
273268
in your expression:
274269

275270
* ``this``: The object being validated (e.g. an instance of BlogPost);

routing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,9 +414,9 @@ arbitrary matching logic:
414414
;
415415
};
416416
417-
The value of the ``condition`` option is any valid :ref:`ExpressionLanguage
418-
expression <expression-language-syntax>` and can use any of these variables
419-
created by Symfony:
417+
The value of the ``condition`` option is an expression using any valid
418+
:ref:`expression language syntax <expression-language-syntax>` and can use any
419+
of these variables created by Symfony:
420420

421421
``context``
422422
An instance of :class:`Symfony\\Component\\Routing\\RequestContext`,

security/expressions.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,10 @@ user object's ``isSuperAdmin()`` method returns ``true``, then access will
3636
be granted (note: your User object may not have an ``isSuperAdmin()`` method,
3737
that method is invented for this example).
3838

39-
This uses an expression and you can learn more about the expression language
40-
syntax, see :ref:`expression-language-syntax`.
41-
4239
.. _security-expression-variables:
4340

44-
Inside the expression, you have access to a number of variables:
41+
The security expression must use any valid :ref:`expression language syntax <expression-language-syntax>`
42+
and can use any of these variables created by Symfony:
4543

4644
``user``
4745
The user object (or the string ``anon`` if you're not authenticated).

service_container/expression_language.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ to another service: ``App\Mailer``. One way to do this is with an expression:
7171
->args([expr("service('App\\\\Mail\\\\MailerConfiguration').getMailerMethod()")]);
7272
};
7373
74-
To learn more about the expression language syntax, see :ref:`expression-language-syntax`.
74+
Learn more about the :ref:`expression language syntax <expression-language-syntax>`.
7575

7676
In this context, you have access to 2 functions:
7777

0 commit comments

Comments
 (0)
0