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

Commit0fe1bfd

Browse files
committed
Merge branch '2.4'
Conflicts:book/routing.rstbook/security.rstchangelog.rstcomponents/config/definition.rstcomponents/dependency_injection/compilation.rstcomponents/finder.rstcomponents/http_foundation/introduction.rstcomponents/process.rstcomponents/property_access/introduction.rstcomponents/stopwatch.rstcookbook/console/sending_emails.rstcookbook/templating/render_without_controller.rstreference/constraints/CardScheme.rstreference/constraints/Luhn.rstreference/twig_reference.rst
2 parents6d00c3d +0ef4751 commit0fe1bfd

File tree

67 files changed

+161
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+161
-147
lines changed

‎book/forms.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,10 +232,10 @@ controller::
232232
}
233233

234234
..versionadded::2.3
235-
The:method:`Symfony\\Component\\Form\\FormInterface::handleRequest` method was
236-
addedin Symfony 2.3. Previously, the ``$request`` was passed to the
237-
``submit`` method - a strategy which is deprecated and will be removed
238-
in Symfony 3.0. For details on that method, see:ref:`cookbook-form-submit-request`.
235+
The:method:`Symfony\\Component\\Form\\FormInterface::handleRequest` method
236+
was introducedin Symfony 2.3. Previously, the ``$request`` was passed
237+
to the``submit`` method - a strategy which is deprecated and will be
238+
removedin Symfony 3.0. For details on that method, see:ref:`cookbook-form-submit-request`.
239239

240240
This controller follows a common pattern for handling forms, and has three
241241
possible paths:

‎book/page_creation.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,5 +1061,5 @@ to rapidly develop applications.
10611061
.. _`Twig`:http://twig.sensiolabs.org
10621062
.. _`third-party bundles`:http://knpbundles.com
10631063
.. _`Symfony Standard Edition`:http://symfony.com/download
1064-
.. _`Apache's DirectoryIndex documentation`:http://httpd.apache.org/docs/2.0/mod/mod_dir.html
1064+
.. _`Apache's DirectoryIndex documentation`:http://httpd.apache.org/docs/current/mod/mod_dir.html
10651065
.. _`Nginx HttpCoreModule location documentation`:http://wiki.nginx.org/HttpCoreModule#location

‎book/testing.rst‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,9 @@ Accessing internal Objects
415415
~~~~~~~~~~~~~~~~~~~~~~~~~~
416416

417417
..versionadded::2.3
418-
The ``getInternalRequest()`` and ``getInternalResponse()`` method were
419-
added in Symfony 2.3.
418+
The:method:`Symfony\\Component\\BrowserKit\\Client::getInternalRequest`
419+
and:method:`Symfony\\Component\\BrowserKit\\Client::getInternalResponse`
420+
methods were introduced in Symfony 2.3.
420421

421422
If you use the client to test your application, you might want to access the
422423
client's internal objects::

‎changelog.rst‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,9 @@ New Documentation
206206
Fixed Documentation
207207
~~~~~~~~~~~~~~~~~~~
208208

209-
- `adcbb5d<https://github.com/symfony/symfony-docs/commit/adcbb5de6c3b8d6ba59e619315ef13fe45318494>`_ #3615 Fixes to cookbook/doctrine/registration_form.rst (Crushnaut)
210209
- `5c4336a<https://github.com/symfony/symfony-docs/commit/5c4336a325ec98bc0eb7ef35baf86bcb9628e490>`_ #3570 Callback: [Validator, validate] expects validate to be static (nixilla)
210+
- `5c367b4<https://github.com/symfony/symfony-docs/commit/5c367b4dfa5c3adc8993702b1ae8f686c74419c8>`_ #3517 Fixed OptionsResolver component docs (WouterJ)
211+
- `adcbb5d<https://github.com/symfony/symfony-docs/commit/adcbb5de6c3b8d6ba59e619315ef13fe45318494>`_ #3615 Fixes to cookbook/doctrine/registration_form.rst (Crushnaut)
211212
- `a21fb26<https://github.com/symfony/symfony-docs/commit/a21fb260978eaa27b1cb94fccb0bd0af71b6df7f>`_ #3559 Remove reference to copying parameters.yml from Git cookbook (pwaring)
212213
- `de71a51<https://github.com/symfony/symfony-docs/commit/de71a5143f6d30fff7e890cea250d047a63916d2>`_ #3551 [Cookbook][Dynamic Form Modification] Fix sample code (rybakit)
213214
- `143db2f<https://github.com/symfony/symfony-docs/commit/143db2f75caa9ef6d7e1c230d0ac9d59c17fde5f>`_ #3550 Update introduction.rst (taavit)

‎components/config/caching.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
..index::
22
single: Config; Caching based on resources
33

4-
Cachingbased onresources
4+
CachingBased onResources
55
==========================
66

77
When all configuration resources are loaded, you may want to process the configuration

‎components/config/definition.rst‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
..index::
22
single: Config; Defining and processing configuration values
33

4-
Defining andprocessing configuration values
4+
Defining andProcessing Configuration Values
55
============================================
66

7-
Validatingconfiguration values
7+
ValidatingConfiguration Values
88
-------------------------------
99

1010
After loading configuration values from all kinds of resources, the values
@@ -38,7 +38,7 @@ they are when first encountered. Also, some keys are only available when
3838
another key has a specific value (in the sample configuration above: the
3939
``memory`` key only makes sense when the ``driver`` is ``sqlite``).
4040

41-
Defining ahierarchy ofconfiguration values using the TreeBuilder
41+
Defining aHierarchy ofConfiguration Values Using the TreeBuilder
4242
------------------------------------------------------------------
4343

4444
All the rules concerning configuration values can be defined using the
@@ -66,10 +66,10 @@ should be returned from a custom ``Configuration`` class which implements the
6666
}
6767
}
6868

69-
Addingnode definitions to thetree
69+
AddingNode Definitions to theTree
7070
-----------------------------------
7171

72-
Variablenodes
72+
VariableNodes
7373
~~~~~~~~~~~~~~
7474

7575
A tree contains node definitions which can be laid out in a semantic way.
@@ -91,7 +91,7 @@ The root node itself is an array node, and has children, like the boolean
9191
node ``auto_connect`` and the scalar node ``default_connection``. In general:
9292
after defining a node, a call to ``end()`` takes you one step up in the hierarchy.
9393

94-
Nodetype
94+
NodeType
9595
~~~~~~~~~
9696

9797
It is possible to validate the type of a provided value by using the appropriate
@@ -108,7 +108,7 @@ node definition. Node type are available for:
108108
and are created with ``node($name, $type)`` or their associated shortcut
109109
``xxxxNode($name)`` method.
110110

111-
Numericnode constraints
111+
NumericNode Constraints
112112
~~~~~~~~~~~~~~~~~~~~~~~~
113113

114114
Numeric nodes (float and integer) provide two extra constraints -
@@ -130,7 +130,7 @@ allowing to validate the value::
130130
->end()
131131
;
132132

133-
Enumnodes
133+
EnumNodes
134134
~~~~~~~~~~
135135

136136
Enum nodes provide a constraint to match the given input against a set of
@@ -146,7 +146,7 @@ values::
146146

147147
This will restrict the ``gender`` option to be either ``male`` or ``female``.
148148

149-
Arraynodes
149+
ArrayNodes
150150
~~~~~~~~~~~
151151

152152
It is possible to add a deeper level to the hierarchy, by adding an array
@@ -187,7 +187,7 @@ inside the current node. According to the prototype definition in the example
187187
above, it is possible to have multiple connection arrays (containing a ``driver``,
188188
``host``, etc.).
189189

190-
Arraynode options
190+
ArrayNode Options
191191
~~~~~~~~~~~~~~~~~~
192192

193193
Before defining the children of an array node, you can provide options like:
@@ -230,7 +230,7 @@ In XML, each ``parameters`` node would have a ``name`` attribute (along with
230230
the final array. The ``useAttributeAsKey`` is useful for normalizing how
231231
arrays are specified between different formats like XML and YAML.
232232

233-
Default and requiredvalues
233+
Default and requiredValues
234234
---------------------------
235235

236236
For all node types, it is possible to define default values and replacement
@@ -307,7 +307,7 @@ you can take advantage of the shortcut
307307
The ``canBeDisabled`` method looks about the same except that the section
308308
would be enabled by default.
309309

310-
Mergingoptions
310+
MergingOptions
311311
---------------
312312

313313
Extra options concerning the merge process may be provided. For arrays:
@@ -321,7 +321,7 @@ For all nodes:
321321
``cannotBeOverwritten()``
322322
don’t let other configuration arrays overwrite an existing value for this node
323323

324-
Appendingsections
324+
AppendingSections
325325
------------------
326326

327327
If you have a complex configuration to validate then the tree can grow to
@@ -493,7 +493,7 @@ By changing a string value into an associative array with ``name`` as the key::
493493
->end()
494494
;
495495

496-
Validationrules
496+
ValidationRules
497497
----------------
498498

499499
More advanced validation rules can be provided using the
@@ -539,7 +539,7 @@ Usually, "then" is a closure. Its return value will be used as a new value
539539
for the node, instead
540540
of the node's original value.
541541

542-
Processingconfiguration values
542+
ProcessingConfiguration Values
543543
-------------------------------
544544

545545
The:class:`Symfony\\Component\\Config\\Definition\\Processor` uses the tree

‎components/config/resources.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
..index::
22
single: Config; Loading resources
33

4-
Loadingresources
4+
LoadingResources
55
=================
66

7-
Locatingresources
7+
LocatingResources
88
------------------
99

1010
Loading the configuration normally starts with a search for resources – in
@@ -24,7 +24,7 @@ look in this directory first. The third argument indicates whether or not the
2424
locator should return the first file it has found, or an array containing
2525
all matches.
2626

27-
Resourceloaders
27+
ResourceLoaders
2828
----------------
2929

3030
For each type of resource (YAML, XML, annotation, etc.) a loader must be defined.
@@ -57,7 +57,7 @@ class, which allows for recursively importing other resources::
5757
}
5858
}
5959

60-
Finding the rightloader
60+
Finding the rightLoader
6161
------------------------
6262

6363
The:class:`Symfony\\Component\\Config\\Loader\\LoaderResolver` receives as

‎components/console/events.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Using Events
55
============
66

77
..versionadded::2.3
8-
Console events wereadded in Symfony 2.3.
8+
Console events wereintroduced in Symfony 2.3.
99

1010
The Application class of the Console component allows you to optionally hook
1111
into the lifecycle of a console application via events. Instead of reinventing
@@ -51,7 +51,7 @@ dispatched. Listeners receive a
5151
$application = $command->getApplication();
5252
});
5353

54-
The ``ConsoleEvents::TERMINATE``event
54+
The ``ConsoleEvents::TERMINATE``Event
5555
--------------------------------------
5656

5757
**Typical Purposes**: To perform some cleanup actions after the command has
@@ -89,7 +89,7 @@ Listeners receive a
8989
It is then dispatched just before the ``ConsoleEvents::EXCEPTION`` event.
9090
The exit code received in this case is the exception code.
9191

92-
The ``ConsoleEvents::EXCEPTION``event
92+
The ``ConsoleEvents::EXCEPTION``Event
9393
--------------------------------------
9494

9595
**Typical Purposes**: Handle exceptions thrown during the execution of a

‎components/console/helpers/dialoghelper.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ All the methods inside the Dialog Helper have an
2323
argument, the question as the second argument and the default value as the last
2424
argument.
2525

26-
Asking the User forconfirmation
26+
Asking the User forConfirmation
2727
--------------------------------
2828

2929
Suppose you want to confirm an action before actually executing it. Add
@@ -172,7 +172,7 @@ You can also ask and validate a hidden response::
172172
If you want to allow the response to be visible if it cannot be hidden for
173173
some reason, pass true as the fifth argument.
174174

175-
Let theuser choose from alist of Answers
175+
Let theUser Choose from aList of Answers
176176
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
177177

178178
If you have a predefined set of answers the user can choose from, you
@@ -240,7 +240,7 @@ this set the seventh argument to ``true``::
240240
Now, when the user enters ``1,2``, the result will be:
241241
``You have just selected: blue, yellow``.
242242

243-
Testing a Command whichexpects input
243+
Testing a Command whichExpects Input
244244
-------------------------------------
245245

246246
If you want to write a unit test for a command which expects some kind of input

‎components/console/introduction.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ method::
472472
You can also test a whole console application by using
473473
:class:`Symfony\\Component\\Console\\Tester\\ApplicationTester`.
474474

475-
Calling anexisting Command
475+
Calling anExisting Command
476476
---------------------------
477477

478478
If a command depends on another one being run before it, instead of asking the

0 commit comments

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