Merge branch '6.4' into 7.3

* 6.4:
  Fix misc grammar issues
  Fix some typos
  [Mercure] Fix a minor RST syntax issue
  Fix some code examples by removing the constructor return type
This commit is contained in:
Javier Eguiluz
2026-01-08 13:30:30 +01:00
12 changed files with 21 additions and 21 deletions

View File

@@ -200,7 +200,7 @@ If you use the :ref:`default services.yaml configuration <service-container-serv
most services will be configured automatically. However, in some edge cases
you'll need to configure services (or parts of them) manually.
YAML is the format recommended configuring services because it's friendly to
YAML is the format recommended for configuring services because it's friendly to
newcomers and concise, but Symfony also supports XML and PHP configuration.
Use Attributes to Define the Doctrine Entity Mapping

View File

@@ -1020,7 +1020,7 @@ be lost without notifying the running processes.
.. tip::
To use ZooKeeper's high-availability feature, you can setup a cluster of
To use ZooKeeper's high-availability feature, you can set up a cluster of
multiple servers so that in case one of the server goes down, the majority
will still be up and serving the requests. All the available servers in the
cluster will see the same state.

View File

@@ -246,7 +246,7 @@ processes asking for the same ``$version``::
Naming Locks
------------
If the application needs different kind of Stores alongside each other, Symfony
If the application needs different kinds of stores alongside each other, Symfony
provides :ref:`named lock <reference-lock-resources-name>`:
.. configuration-block::
@@ -306,7 +306,7 @@ For example, to inject the ``invoice`` package defined earlier::
{
public function __construct(
private LockFactory $invoiceLockFactory
): void {
) {
// ...
}
}
@@ -326,7 +326,7 @@ For example, to select the ``invoice`` lock defined earlier::
{
public function __construct(
#[Target('lock.invoice.factory')] private LockFactory $lockFactory
): void {
) {
// ...
}
}

View File

@@ -466,7 +466,7 @@ As per RFC2732, IPv6 addresses must be enclosed in square brackets. To bind to I
Overriding default SMTP authenticators
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
By default, SMTP transports will try to login using all authentication methods
By default, SMTP transports will try to log in using all authentication methods
available on the SMTP server, one after the other. In some cases, it may be
useful to redefine the supported authentication methods to ensure that the
preferred method will be used first.

View File

@@ -4,7 +4,7 @@ Pushing Data to Clients Using the Mercure Protocol
Being able to broadcast data in real-time from servers to clients is a
requirement for many modern web and mobile applications.
Creating a UI reacting in live to changes made by other users
Creating a UI reacting live to changes made by other users
(e.g. a user changes the data currently browsed by several other users,
all UIs are instantly updated),
notifying the user when :doc:`an asynchronous job </messenger>` has been
@@ -703,7 +703,7 @@ Debugging
The WebProfiler panel was introduced in MercureBundle 0.2.
MercureBundle is shipped with a debug panel. Install the Debug pack to
enable it::
enable it:
.. code-block:: terminal
@@ -726,11 +726,11 @@ Async dispatching
usually not necessary.
Instead of calling the ``Publisher`` service directly, you can also let Symfony
dispatching the updates asynchronously thanks to the provided integration with
dispatch the updates asynchronously thanks to the provided integration with
the Messenger component.
First, be sure :doc:`to install the Messenger component </messenger>`
and to configure properly a transport (if you don't, the handler will
and to properly configure a transport (if you don't, the handler will
be called synchronously).
Then, dispatch the Mercure ``Update`` to the Messenger's Message Bus,

View File

@@ -131,7 +131,7 @@ Additionally legacy code tends to be hard to write tests for, making the process
slow and cumbersome.
Instead of providing low level tests, that ensure each class works as expected, it
might makes sense to write high level tests ensuring that at least anything user
might make sense to write high level tests ensuring that at least anything user
facing works on at least a superficial level. These kinds of tests are commonly
called End-to-End tests, because they cover the whole application from what the
user sees in the browser down to the very code that is being run and connected
@@ -139,7 +139,7 @@ services like a database. To automate this you have to make sure that you can
get a test instance of your system running as easily as possible and making
sure that external systems do not change your production environment, e.g.
provide a separate test database with (anonymized) data from a production
system or being able to setup a new schema with a basic dataset for your test
system or being able to set up a new schema with a basic dataset for your test
environment. Since these tests do not rely as much on isolating testable code
and instead look at the interconnected system, writing them is usually easier
and more productive when doing a migration. You can then limit your effort on

View File

@@ -237,7 +237,7 @@ Great news! You've already worked inside the most important directories in your
project:
``config/``
Contains... configuration!. You will configure routes,
Contains configuration. You will configure routes,
:doc:`services </service_container>` and packages.
``src/``

View File

@@ -76,7 +76,7 @@ To achieve this, the rate limit is approximated based on the current window and
the previous window.
For example: the limit is 5,000 requests per hour; a user made 4,000 requests
the previous hour and 500 requests this hour. 15 minutes in to the current hour
the previous hour and 500 requests this hour. 15 minutes into the current hour
(25% of the window) the hit count would be calculated as: 75% * 4,000 + 500 = 3,500.
At this point in time the user can only do 1,500 more requests.

View File

@@ -292,7 +292,7 @@ to inject the ``foo_package`` package defined earlier::
{
public function __construct(
private PackageInterface $fooPackage
): void {
) {
// ...
}
}
@@ -312,7 +312,7 @@ For example, to select the ``foo_package`` package defined earlier::
{
public function __construct(
#[Target('foo_package.package')] private PackageInterface $package
): void {
) {
// ...
}
}

View File

@@ -41,7 +41,7 @@ unauthenticated user tries to access a protected resource::
public function start(Request $request, ?AuthenticationException $authException = null): RedirectResponse
{
// add a custom flash message and redirect to the login page
$request->getSession()->getFlashBag()->add('note', 'You have to login in order to access this page.');
$request->getSession()->getFlashBag()->add('note', 'You have to log in to access this page.');
return new RedirectResponse($this->urlGenerator->generate('security_login'));
}

View File

@@ -206,7 +206,7 @@ link is created using
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Now the link is created, it needs to be sent to the user. Anyone with the
link is able to login as this user, so you need to make sure to send it to
link is able to log in as this user, so you need to make sure to send it to
a known device of them (e.g. using e-mail or SMS).
You can send the link using any library or method. However the login link
@@ -321,7 +321,7 @@ Limit Login Link Lifetime
~~~~~~~~~~~~~~~~~~~~~~~~~
It is important for login links to have a limited lifetime. This reduces
the risk that someone can intercept the link and use it to login as
the risk that someone can intercept the link and use it to log in as
somebody else. By default, Symfony defines a lifetime of 10 minutes (600
seconds). You can customize this using the ``lifetime`` option:
@@ -638,7 +638,7 @@ user create this POST request (e.g. by clicking a button)::
{% extends 'base.html.twig' %}
{% block body %}
<h2>Hi! You are about to login to ...</h2>
<h2>Hi! You are about to log in to ...</h2>
<!-- for instance, use a form with hidden fields to
create the POST request -->

View File

@@ -1,7 +1,7 @@
Password Hashing and Verification
=================================
Most applications use passwords to login users. These passwords should be
Most applications use passwords to log in users. These passwords should be
hashed to securely store them. Symfony's PasswordHasher component provides
all utilities to safely hash and verify passwords.