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

Commita7f704c

Browse files
committed
Merge branch '3.1'
2 parentsda458d5 +1c8d4f1 commita7f704c

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
@@ -722,7 +722,7 @@ The builder is used for adding advanced validation rules to node definitions, li
722722
->isRequired()
723723
->validate()
724724
->ifNotInArray(array('mysql', 'sqlite', 'mssql'))
725-
->thenInvalid('Invalid database driver"%s"')
725+
->thenInvalid('Invalid database driver%s')
726726
->end()
727727
->end()
728728
->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
@@ -134,7 +134,7 @@ The following snippet adds CSRF protection to the form factory::
134134

135135
$formFactory = Forms::createFormFactoryBuilder()
136136
// ...
137-
->addExtension(new CsrfExtension($csrfStorage))
137+
->addExtension(new CsrfExtension($csrfManager))
138138
->getFormFactory();
139139

140140
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
@@ -28,7 +28,7 @@ Basic Usage
2828

2929
The following constraints ensure that:
3030

31-
* ``firstName`` of ``Person` class is equal to ``Mary`` *and* is a string
31+
* ``firstName`` of ``Person`` class is equal to ``Mary`` *and* is a string
3232
* ``age`` is equal to``20`` *and* is of type integer
3333

3434
..configuration-block::

‎serializer.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,15 @@ Here is an example on how to load the
9292
services:
9393
get_set_method_normalizer:
9494
class:Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer
95+
public:false
9596
tags:
9697
-{ name: serializer.normalizer }
9798
9899
..code-block::xml
99100
100101
<!-- app/config/services.xml-->
101102
<services>
102-
<serviceid="get_set_method_normalizer"class="Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer">
103+
<serviceid="get_set_method_normalizer"class="Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer"public="false">
103104
<tagname="serializer.normalizer" />
104105
</service>
105106
</services>
@@ -112,6 +113,7 @@ Here is an example on how to load the
112113
$definition = new Definition(
113114
'Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer'
114115
));
116+
$definition->setPublic(false);
115117
$definition->addTag('serializer.normalizer');
116118
$container->setDefinition('get_set_method_normalizer', $definition);
117119

‎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