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

Commit24d1e88

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: [#6579] some tweaks Added callable validation_groups example Fix console.exception and console.terminate order Update options_resolver.rst Fixed a typo in cookbook/security/entity_provider Added a note about coding standards and method arguments reflect the EOM of Symfony 2.3
2 parents1ec853b +7adc43d commit24d1e88

File tree

14 files changed

+127
-37
lines changed

14 files changed

+127
-37
lines changed

‎README.markdown‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Contributing
77
------------
88

99
>**Note**
10-
>Unless you're documenting a feature that was introduced*after* Symfony 2.3
11-
>(e.g. in Symfony 2.4), all pull requests must be based off of the**2.3** branch,
10+
>Unless you're documenting a feature that was introduced*after* Symfony 2.7
11+
>(e.g. in Symfony 2.8), all pull requests must be based off of the**2.7** branch,
1212
>**not** the master or older branches.
1313
1414
We love contributors! For more information on how you can contribute to the

‎book/forms.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,12 @@ Now the form will skip your validation constraints. It will still validate
616616
basic integrity constraints, such as checking whether an uploaded file was too
617617
large or whether you tried to submit text in a number field.
618618

619+
..seealso::
620+
621+
To see how to use a service to resolve ``validation_groups`` dynamically
622+
read the:doc:`/cookbook/validation/validation-group-service-resolver`
623+
chapter in the cookbook.
624+
619625
..index::
620626
single: Forms; Built-in field types
621627

‎components/console/events.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Listeners receive a
118118
..tip::
119119

120120
This event is also dispatched when an exception is thrown by the command.
121-
It is then dispatched justbefore the ``ConsoleEvents::EXCEPTION`` event.
121+
It is then dispatched justafter the ``ConsoleEvents::EXCEPTION`` event.
122122
The exit code received in this case is the exception code.
123123

124124
The ``ConsoleEvents::EXCEPTION`` Event

‎components/options_resolver.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ if you need to use other options during normalization::
430430
{
431431
// ...
432432
$resolver->setNormalizer('host', function (Options $options, $value) {
433-
if (!in_array(substr($value, 0, 7), array('http://', 'https://'))) {
433+
if ('http://' !==substr($value, 0, 7) && 'https://' !== substr($value, 0, 8)) {
434434
if ('ssl' === $options['encryption']) {
435435
$value = 'https://'.$value;
436436
} else {

‎contributing/code/patches.rst‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Choose the right Branch
113113
Before working on a patch, you must determine on which branch you need to
114114
work:
115115

116-
* ``2.3``, if you are fixing a bug for an existing feature or want to make a
116+
* ``2.7``, if you are fixing a bug for an existing feature or want to make a
117117
change that falls into the:doc:`list of acceptable changes in patch versions
118118
</contributing/code/maintenance>` (you may have to choose a higher branch if
119119
the feature you are fixing was introduced in a later version);
@@ -124,7 +124,7 @@ work:
124124

125125
All bug fixes merged into maintenance branches are also merged into more
126126
recent branches on a regular basis. For instance, if you submit a patch
127-
for the ``2.3`` branch, the patch will also be applied by the core team on
127+
for the ``2.7`` branch, the patch will also be applied by the core team on
128128
the ``master`` branch.
129129

130130
Create a Topic Branch
@@ -137,18 +137,18 @@ topic branch:
137137
138138
$ git checkout -b BRANCH_NAME master
139139
140-
Or, if you want to provide a bugfix for the ``2.3`` branch, first track the remote
141-
``2.3`` branch locally:
140+
Or, if you want to provide a bugfix for the ``2.7`` branch, first track the remote
141+
``2.7`` branch locally:
142142

143143
..code-block::bash
144144
145-
$ git checkout -t origin/2.3
145+
$ git checkout -t origin/2.7
146146
147-
Then create a new branch off the ``2.3`` branch to work on the bugfix:
147+
Then create a new branch off the ``2.7`` branch to work on the bugfix:
148148

149149
..code-block::bash
150150
151-
$ git checkout -b BRANCH_NAME 2.3
151+
$ git checkout -b BRANCH_NAME 2.7
152152
153153
..tip::
154154

@@ -236,7 +236,7 @@ while to finish your changes):
236236
237237
..tip::
238238

239-
Replace ``master`` with the branch you selected previously (e.g. ``2.3``)
239+
Replace ``master`` with the branch you selected previously (e.g. ``2.7``)
240240
if you are working on a bugfix
241241

242242
When doing the ``rebase`` command, you might have to fix merge conflicts.
@@ -263,8 +263,8 @@ You can now make a pull request on the ``symfony/symfony`` GitHub repository.
263263

264264
..tip::
265265

266-
Take care to point your pull request towards ``symfony:2.3`` if you want
267-
the core team to pull a bugfix based on the ``2.3`` branch.
266+
Take care to point your pull request towards ``symfony:2.7`` if you want
267+
the core team to pull a bugfix based on the ``2.7`` branch.
268268

269269
To ease the core team work, always include the modified components in your
270270
pull request message, like in:
@@ -335,7 +335,7 @@ Rework your Patch
335335

336336
Based on the feedback on the pull request, you might need to rework your
337337
patch. Before re-submitting the patch, rebase with ``upstream/master`` or
338-
``upstream/2.3``, don't merge; and force the push to the origin:
338+
``upstream/2.7``, don't merge; and force the push to the origin:
339339

340340
..code-block::bash
341341

‎contributing/code/standards.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,19 @@ Structure
153153
that are not intended to be instantiated from the outside and thus are not
154154
concerned by the `PSR-0`_ and `PSR-4`_ autoload standards;
155155

156+
* Declare the class inheritance and all the implemented interfaces on the same
157+
line as the class name;
158+
156159
* Declare class properties before methods;
157160

158161
* Declare public methods first, then protected ones and finally private ones.
159162
The exceptions to this rule are the class constructor and the ``setUp`` and
160163
``tearDown`` methods of PHPUnit tests, which should always be the first methods
161164
to increase readability;
162165

166+
* Declare all the arguments on the same line as the method/function name, no
167+
matter how many arguments there are;
168+
163169
* Use parentheses when instantiating classes regardless of the number of
164170
arguments the constructor has;
165171

‎contributing/documentation/format.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ Symfony, you should precede your description of the change with a
177177

178178
..code-block::rst
179179
180-
.. versionadded:: 2.3
181-
The ``askHiddenResponse`` method was introduced in Symfony 2.3.
180+
.. versionadded:: 2.7
181+
The ``askHiddenResponse`` method was introduced in Symfony 2.7.
182182
183183
You can also ask a question and hide the response. This is particularly [...]
184184
@@ -187,9 +187,9 @@ how the behavior has changed:
187187

188188
..code-block::rst
189189
190-
.. versionadded:: 2.3
190+
.. versionadded:: 2.7
191191
The ``include()`` function is a new Twig feature that's available in
192-
Symfony 2.3. Prior, the ``{% include %}`` tag was used.
192+
Symfony 2.7. Prior, the ``{% include %}`` tag was used.
193193
194194
Whenever a new minor version of Symfony is released (e.g. 2.4, 2.5, etc),
195195
a new branch of the documentation is created from the ``master`` branch.

‎contributing/documentation/overview.rst‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,14 @@ memorable name for the new branch (if you are fixing a reported issue, use
116116

117117
..code-block::bash
118118
119-
$ git checkout -b improve_install_chapter upstream/2.3
119+
$ git checkout -b improve_install_chapter upstream/2.7
120120
121121
In this example, the name of the branch is ``improve_install_chapter`` and the
122-
``upstream/2.3`` value tells Git to create this branch based on the ``2.3``
122+
``upstream/2.7`` value tells Git to create this branch based on the ``2.7``
123123
branch of the ``upstream`` remote, which is the original Symfony Docs repository.
124124

125125
Fixes should always be based on the **oldest maintained branch** which contains
126-
the error. Nowadays this is the ``2.3`` branch. If you are instead documenting a
126+
the error. Nowadays this is the ``2.7`` branch. If you are instead documenting a
127127
new feature, switch to the first Symfony version that included it, e.g.
128128
``upstream/3.1``. Not sure? That's ok! Just use the ``upstream/master`` branch.
129129

@@ -159,7 +159,7 @@ changes should be applied:
159159
:align:center
160160

161161
In this example, the **base fork** should be ``symfony/symfony-docs`` and
162-
the **base** branch should be the ``2.3``, which is the branch that you selected
162+
the **base** branch should be the ``2.7``, which is the branch that you selected
163163
to base your changes on. The **head fork** should be your forked copy
164164
of ``symfony-docs`` and the **compare** branch should be ``improve_install_chapter``,
165165
which is the name of the branch you created and where you made your changes.
@@ -208,7 +208,7 @@ contribution to the Symfony docs:
208208
209209
# create a new branch based on the oldest maintained version
210210
$cd projects/symfony-docs/
211-
$ git checkout -b my_changes upstream/2.3
211+
$ git checkout -b my_changes upstream/2.7
212212
213213
# ... do your changes
214214
@@ -265,8 +265,8 @@ into multiple branches, corresponding to the different versions of Symfony itsel
265265
The ``master`` branch holds the documentation for the development branch of
266266
the code.
267267

268-
Unless you're documenting a feature that was introduced after Symfony 2.3,
269-
your changes should always be based on the ``2.3`` branch. Documentation managers
268+
Unless you're documenting a feature that was introduced after Symfony 2.7,
269+
your changes should always be based on the ``2.7`` branch. Documentation managers
270270
will use the necessary Git-magic to also apply your changes to all the active
271271
branches of the documentation.
272272

‎cookbook/map.rst.inc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@
249249

250250
* :doc:`/cookbook/validation/custom_constraint`
251251
* :doc:`/cookbook/validation/severity`
252+
* :doc:`/cookbook/validation/group_service_resolver`
252253

253254
* :doc:`/cookbook/web_server/index`
254255

‎cookbook/security/entity_provider.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ and password ``admin`` (which has been encoded).
312312
| 1| admin|$2a$08$jHZj/wJfcVKlIwr5AvR78euJxYK7Ku5kURNhNx.7.CSIJ3Pq6LEPC| admin@example.com| 1|
313313
+----+----------+--------------------------------------------------------------+--------------------+-----------+
314314
315-
..sidebar::Do you need to a Salt property?
315+
..sidebar::Do you need tousea Salt property?
316316

317317
If you use ``bcrypt``, no. Otherwise, yes. All passwords must be hashed
318318
with a salt, but ``bcrypt`` does this internally. Since this tutorial

0 commit comments

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