Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit857725b

Browse files
committed
Merge branch '2.4'
2 parentsdf63740 +f893883 commit857725b

File tree

8 files changed

+28
-13
lines changed

8 files changed

+28
-13
lines changed

‎book/installation.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ to check your configuration:
212212
213213
If there are any issues, correct them now before moving on.
214214

215+
.. _book-installation-permissions:
216+
215217
..sidebar::Setting up Permissions
216218

217219
One common issue is that the ``app/cache`` and ``app/logs`` directories

‎components/expression_language/syntax.rst‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,10 @@ Comparison Operators
176176
To test if a string does *not* match a regex, use the logical ``not``
177177
operator in combination with the ``matches`` operator::
178178

179-
$language->evaluate('not "foo" matches "/bar/"'); // returns true
179+
$language->evaluate('not ("foo" matches "/bar/")'); // returns true
180+
181+
You must use parenthesis because the unary operator ``not`` has precedence
182+
over the binary operator ``matches``.
180183

181184
Examples::
182185

‎cookbook/controller/service.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ To refer to a controller that's defined as a service, use the single colon (:)
9696
notation. For example, to forward to the ``indexAction()`` method of the service
9797
defined above with the id ``acme.hello.controller``::
9898

99-
$this->forward('acme.hello.controller:indexAction');
99+
$this->forward('acme.hello.controller:indexAction', array('name' => $name));
100100

101101
..note::
102102

‎cookbook/testing/profiling.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ finish. It's easy to achieve if you embed the token in the error message::
5151

5252
$this->assertLessThan(
5353
30,
54-
$profile->get('db')->getQueryCount(),
54+
$profile->getCollector('db')->getQueryCount(),
5555
sprintf(
5656
'Checks that query count is less than 30 (token %s)',
5757
$profile->getToken()

‎reference/constraints/Valid.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ object and all sub-objects associated with it.
99
| Applies to|:ref:`property or method<validation-property-target>`|
1010
+----------------+---------------------------------------------------------------------+
1111
| Options| - `traverse`_|
12+
|| - `message`_|
1213
+----------------+---------------------------------------------------------------------+
1314
| Class|:class:`Symfony\\Component\\Validator\\Constraints\\Type`|
1415
+----------------+---------------------------------------------------------------------+
@@ -265,3 +266,10 @@ traverse
265266
If this constraint is applied to a property that holds an array of objects,
266267
then each object in that array will be validated only if this option is set
267268
to ``true``.
269+
270+
message
271+
~~~~~~~
272+
273+
**type**: ``string`` **default**: ``This value should be true.``
274+
275+
This is the message that will be shown if the value is false.

‎reference/forms/types/form.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@ See :class:`Symfony\\Component\\Form\\Extension\\Core\\Type\\FormType`.
99
The ``form`` type predefines a couple of options that are then available
1010
on all fields.
1111

12-
..include::/reference/forms/types/options/compound.rst.inc
13-
1412
..include::/reference/forms/types/options/data.rst.inc
1513

1614
..include::/reference/forms/types/options/data_class.rst.inc
1715

16+
..include::/reference/forms/types/options/action.rst.inc
17+
18+
..include::/reference/forms/types/options/method.rst.inc
19+
1820
..include::/reference/forms/types/options/empty_data.rst.inc
1921

22+
..include::/reference/forms/types/options/compound.rst.inc
23+
2024
.. _reference-form-option-required:
2125

2226
..include::/reference/forms/types/options/required.rst.inc
@@ -68,7 +72,3 @@ on all fields.
6872
.. _reference-form-option-pattern:
6973

7074
..include::/reference/forms/types/options/pattern.rst.inc
71-
72-
..include::/reference/forms/types/options/action.rst.inc
73-
74-
..include::/reference/forms/types/options/method.rst.inc

‎reference/forms/types/options/action.rst.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ action
66

77
**type**: ``string``**default**: empty string
88

9-
This option specifies where to send the form's data on submission (usuallyan
9+
This option specifies where to send the form's data on submission (usuallya
1010
URI). Its value is rendered as the ``action`` attribute of the ``form``
1111
element. An empty value is considered a same-document reference, i.e. the form
1212
will be submitted to the same URI that rendered the form.

‎reference/forms/types/options/method.rst.inc‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ used to decide whether to process the form submission in the
2626

2727
..note:
2828

29-
Only the PATCH method allows submitting partial data without that missing
30-
fields are set to ``null``in the underlyingdata (preserving default
31-
values,if any).
29+
The PATCH method allows submitting partial data. In other words,if the
30+
submitted form data is missing certain fields, those will be ignored
31+
and the defaultvalues (if any) will be used. With all other HTTP methods,
32+
if the submitted form data is missing some fields, those fields are set
33+
to ``null``.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp