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

Commitf7dad82

Browse files
committed
Merge branch '2.7' into 2.8
2 parentsc56d5d8 +b7b13f0 commitf7dad82

File tree

7 files changed

+12
-6
lines changed

7 files changed

+12
-6
lines changed

‎components/config/definition.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ The builder is used for adding advanced validation rules to node definitions, li
726726
->isRequired()
727727
->validate()
728728
->ifNotInArray(array('mysql', 'sqlite', 'mssql'))
729-
->thenInvalid('Invalid database driver"%s"')
729+
->thenInvalid('Invalid database driver%s')
730730
->end()
731731
->end()
732732
->end()

‎components/finder.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ directories::
4141
}
4242

4343
The ``$file`` is an instance of:class:`Symfony\\Component\\Finder\\SplFileInfo`
44-
which extends:phpclass:`SplFileInfo` to provide methods to work with relative
44+
which extendsPHP's own:phpclass:`SplFileInfo` to provide methods to work with relative
4545
paths.
4646

4747
The above code prints the names of all the files in the current directory

‎components/form.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ The following snippet adds CSRF protection to the form factory::
137137

138138
$formFactory = Forms::createFormFactoryBuilder()
139139
// ...
140-
->addExtension(new CsrfExtension($csrfStorage))
140+
->addExtension(new CsrfExtension($csrfManager))
141141
->getFormFactory();
142142

143143
Internally, this extension will automatically add a hidden field to every

‎contributing/code/core_team.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ Active Core Members
7171
* **Javier Eguiluz** (`javiereguiluz`_) can merge into theWebProfilerBundle_
7272
bundle.
7373

74+
* **Grégoire Pineau** (`lyrixx`_) can merge into theWorkflow_ component.
75+
7476
* **Deciders** (``@symfony/deciders`` on GitHub):
7577

7678
* **Jordi Boggiano** (`seldaek`_);
@@ -181,6 +183,7 @@ discretion of the **Project Leader**.
181183
.. _TwigBridge:https://github.com/symfony/twig-bridge
182184
.. _Validator:https://github.com/symfony/validator
183185
.. _VarDumper:https://github.com/symfony/var-dumper
186+
.. _Workflow:https://github.com/symfony/workflow
184187
.. _Yaml:https://github.com/symfony/yaml
185188
.. _WebProfilerBundle:https://github.com/symfony/web-profiler-bundle
186189
.. _`fabpot`:https://github.com/fabpot/
@@ -197,3 +200,4 @@ discretion of the **Project Leader**.
197200
.. _`aitboudad`:https://github.com/aitboudad/
198201
.. _`xabbuh`:https://github.com/xabbuh/
199202
.. _`javiereguiluz`:https://github.com/javiereguiluz/
203+
.. _`lyrixx`:https://github.com/lyrixx/

‎reference/constraints/IdenticalTo.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Basic Usage
3131

3232
The following constraints ensure that:
3333

34-
* ``firstName`` of ``Person` class is equal to ``Mary`` *and* is a string
34+
* ``firstName`` of ``Person`` class is equal to ``Mary`` *and* is a string
3535
* ``age`` is equal to``20`` *and* is of type integer
3636

3737
..configuration-block::

‎serializer.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,15 @@ Here is an example on how to load the
101101
services:
102102
get_set_method_normalizer:
103103
class:Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer
104+
public:false
104105
tags:
105106
-{ name: serializer.normalizer }
106107
107108
..code-block::xml
108109
109110
<!-- app/config/services.xml-->
110111
<services>
111-
<serviceid="get_set_method_normalizer"class="Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer">
112+
<serviceid="get_set_method_normalizer"class="Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer"public="false">
112113
<tagname="serializer.normalizer" />
113114
</service>
114115
</services>
@@ -121,6 +122,7 @@ Here is an example on how to load the
121122
$definition = new Definition(
122123
'Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer'
123124
));
125+
$definition->setPublic(false);
124126
$definition->addTag('serializer.normalizer');
125127
$container->setDefinition('get_set_method_normalizer', $definition);
126128

‎service_container/definitions.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ fetched from the container::
9696
..caution::
9797

9898
Don't use ``get()`` to get a service that you want to inject as constructor
99-
argument, the service is not yet availabe. Instead, useinjecta
99+
argument, the service is not yet availabe. Instead, use a
100100
``Reference`` instance as shown above.
101101

102102
Method Calls

0 commit comments

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