Skip to content

Commit e75bb1e

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: clarify how to disable client-side validation using the Regex constraint Fix ScheduledStamp FQN example function param 1 requires string Minor tweak in the setup page Update configuration.rst style: Typo in content title fix dump destination value in PHP config
2 parents c404257 + 8a3b638 commit e75bb1e

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

bundles/configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class, you can add all the logic related to processing the configuration in that
9393
// the "$config" variable is already merged and processed so you can
9494
// use it directly to configure the service container (when defining an
9595
// extension class, you also have to do this merging and processing)
96-
$containerConfigurator->services()
96+
$container->services()
9797
->get('acme_social.twitter_client')
9898
->arg(0, $config['twitter']['client_id'])
9999
->arg(1, $config['twitter']['client_secret'])

components/messenger.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Here are some important envelope stamps that are shipped with the Symfony Messen
162162
to configure the validation groups used when the validation middleware is enabled.
163163
* :class:`Symfony\\Component\\Messenger\\Stamp\\ErrorDetailsStamp`,
164164
an internal stamp when a message fails due to an exception in the handler.
165-
* :class:`Symfony\\Component\\Messenger\\Stamp\\ScheduledStamp`,
165+
* :class:`Symfony\\Component\\Scheduler\\Messenger\\ScheduledStamp`,
166166
a stamp that marks the message as produced by a scheduler. This helps
167167
differentiate it from messages created "manually". You can learn more about it
168168
in the :doc:`Scheduler documentation </scheduler>`.

components/var_dumper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ For example, to get a dump as a string in a variable, you can do::
623623

624624
$dumper->dump(
625625
$cloner->cloneVar($variable),
626-
function (int $line, int $depth) use (&$output): void {
626+
function (string $line, int $depth) use (&$output): void {
627627
// A negative depth means "end of dump"
628628
if ($depth >= 0) {
629629
// Adds a two spaces indentation to the line

reference/configuration/debug.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ Typically, you would set this to ``php://stderr``:
9595
9696
return static function (ContainerConfigurator $container): void {
9797
$container->extension('debug', [
98-
'dump_destination' => 'tcp://%env(VAR_DUMPER_SERVER)%',
98+
'dump_destination' => 'php://stderr',
9999
]);
100100
};
101101

reference/constraints/Regex.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ Options
163163
``htmlPattern``
164164
~~~~~~~~~~~~~~~
165165

166-
**type**: ``string|boolean`` **default**: ``null``
166+
**type**: ``string|null`` **default**: ``null``
167167

168168
This option specifies the pattern to use in the HTML5 ``pattern`` attribute.
169169
You usually don't need to specify this option because by default, the constraint
@@ -243,7 +243,7 @@ need to specify the HTML5 compatible pattern in the ``htmlPattern`` option:
243243
}
244244
}
245245
246-
Setting ``htmlPattern`` to false will disable client side validation.
246+
Setting ``htmlPattern`` to the empty string will disable client side validation.
247247

248248
``match``
249249
~~~~~~~~~

setup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ requirements. Open your console terminal and run this command:
3434
3535
.. note::
3636

37-
The Symfony CLI is written in Go and you can contribute to it in the
37+
The Symfony CLI is open source, and you can contribute to it in the
3838
`symfony-cli/symfony-cli GitHub repository`_.
3939

4040
.. _creating-symfony-applications:

testing/database.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ the employee which gets returned by the ``Repository``, which itself gets
8383
returned by the ``EntityManager``. This way, no real class is involved in
8484
testing.
8585

86-
Functional Testing of A Doctrine Repository
86+
Functional Testing of a Doctrine Repository
8787
-------------------------------------------
8888

8989
In :ref:`functional tests <functional-tests>` you'll make queries to the

0 commit comments

Comments
 (0)