Skip to content

Commit ca11ad3

Browse files
committed
Merge branch '2.8' into 3.4
* 2.8: fixing second stopwatch example in phpunit-bridge docs fix console script path improve validation groups references Fix typo
2 parents 0af9572 + dc7f8cc commit ca11ad3

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

components/form.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -728,7 +728,7 @@ method to access the list of errors. It returns a
728728
// ...
729729

730730
// a FormErrorIterator instance, but only errors attached to this
731-
// form level (e.g. "global errors)
731+
// form level (e.g. global errors)
732732
$errors = $form->getErrors();
733733

734734
// a FormErrorIterator instance, but only errors attached to the

components/phpunit_bridge.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,11 +296,11 @@ test::
296296
{
297297
$stopwatch = new Stopwatch();
298298

299-
$stopwatch->start();
299+
$stopwatch->start('event_name');
300300
sleep(10);
301-
$duration = $stopwatch->stop();
301+
$duration = $stopwatch->stop('event_name')->getDuration();
302302

303-
$this->assertEquals(10, $duration);
303+
$this->assertEquals(10000, $duration);
304304
}
305305
}
306306

configuration/multiple_kernels.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@ config files or better, import them and override the needed options:
143143
Executing Commands with a Different Kernel
144144
------------------------------------------
145145

146-
The ``bin/console`` script used to run Symfony commands always uses the default
146+
The ``app/console`` script used to run Symfony commands always uses the default
147147
``AppKernel`` class to build the application and load the commands. If you need
148-
to execute console commands using the new kernel, duplicate the ``bin/console``
148+
to execute console commands using the new kernel, duplicate the ``app/console``
149149
script and rename it (e.g. ``bin/api``).
150150

151151
Then, replace the ``AppKernel`` instantiation by your own kernel instantiation
@@ -155,7 +155,7 @@ new kernel.
155155

156156
.. note::
157157

158-
The commands available for each console script (e.g. ``bin/console`` and
158+
The commands available for each console script (e.g. ``app/console`` and
159159
``bin/api``) can differ because they depend on the bundles enabled for each
160160
kernel, which could be different.
161161

reference/events.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ their priorities:
4343

4444
.. code-block:: terminal
4545
46-
$ php bin/console debug:event-dispatcher kernel.request
46+
$ php app/console debug:event-dispatcher kernel.request
4747
4848
``kernel.controller``
4949
~~~~~~~~~~~~~~~~~~~~~
@@ -74,7 +74,7 @@ their priorities:
7474

7575
.. code-block:: terminal
7676
77-
$ php bin/console debug:event-dispatcher kernel.controller
77+
$ php app/console debug:event-dispatcher kernel.controller
7878
7979
``kernel.view``
8080
~~~~~~~~~~~~~~~
@@ -108,7 +108,7 @@ their priorities:
108108

109109
.. code-block:: terminal
110110
111-
$ php bin/console debug:event-dispatcher kernel.view
111+
$ php app/console debug:event-dispatcher kernel.view
112112
113113
``kernel.response``
114114
~~~~~~~~~~~~~~~~~~~
@@ -135,7 +135,7 @@ their priorities:
135135

136136
.. code-block:: terminal
137137
138-
$ php bin/console debug:event-dispatcher kernel.response
138+
$ php app/console debug:event-dispatcher kernel.response
139139
140140
``kernel.finish_request``
141141
~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -162,7 +162,7 @@ their priorities:
162162

163163
.. code-block:: terminal
164164
165-
$ php bin/console debug:event-dispatcher kernel.finish_request
165+
$ php app/console debug:event-dispatcher kernel.finish_request
166166
167167
``kernel.terminate``
168168
~~~~~~~~~~~~~~~~~~~~
@@ -183,7 +183,7 @@ their priorities:
183183

184184
.. code-block:: terminal
185185
186-
$ php bin/console debug:event-dispatcher kernel.terminate
186+
$ php app/console debug:event-dispatcher kernel.terminate
187187
188188
.. _kernel-kernel.exception:
189189

@@ -256,6 +256,6 @@ their priorities:
256256

257257
.. code-block:: terminal
258258
259-
$ php bin/console debug:event-dispatcher kernel.exception
259+
$ php app/console debug:event-dispatcher kernel.exception
260260
261261
.. _`param converters`: https://symfony.com/doc/master/bundles/SensioFrameworkExtraBundle/annotations/converters.html

validation/groups.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ With this configuration, there are three validation groups:
137137
``User``
138138
Equivalent to all constraints of the ``User`` object in the ``Default``
139139
group. This is always the name of the class. The difference between this
140-
and ``Default`` is explained below.
140+
and ``Default`` is explained in :doc:`/validation/sequence_provider`.
141141

142142
``registration``
143143
Contains the constraints on the ``email`` and ``password`` fields only.

validation/sequence_provider.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ that group are valid, the second group, ``Strict``, will be validated.
128128

129129
.. caution::
130130

131-
As you have already seen in the previous section, the ``Default`` group
131+
As you have already seen in :doc:`/validation/groups`, the ``Default`` group
132132
and the group containing the class name (e.g. ``User``) were identical.
133133
However, when using Group Sequences, they are no longer identical. The
134134
``Default`` group will now reference the group sequence, instead of all

0 commit comments

Comments
 (0)