Skip to content

Commit d4a76ae

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Correct spelling & grammar in 4.4 testing.rst Correct spelling & grammar in 4.4 controller/ Correct spelling & grammar in 4.4 configuration/ Correct spelling & grammar in 4.4 components/yaml/ Correct spelling & grammar in 4.4 components/security/ Correct spelling & grammar in 4.4 components/http_foundation/ Correct spelling & grammar in 4.4 components/cache/ Correct spelling & grammar in 4.4 logging.rst Correct spelling & grammar in 4.4 lock.rst Correct spelling & grammar in 4.4 http_client.rst Correct spelling & grammar in 4.4 http_cache.rst
2 parents b376382 + 04d01dd commit d4a76ae

15 files changed

+27
-27
lines changed

components/cache/adapters/php_array_cache_adapter.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PHP Array Cache Adapter
77

88
This adapter is a high performance cache for static data (e.g. application configuration)
99
that is optimized and preloaded into OPcache memory storage. It is suited for any data that
10-
is mostly read-only after warmup::
10+
is mostly read-only after warm-up::
1111

1212
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
1313
use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
@@ -23,7 +23,7 @@ is mostly read-only after warmup::
2323
$cache = new PhpArrayAdapter(
2424
// single file where values are cached
2525
__DIR__ . '/somefile.cache',
26-
// a backup adapter, if you set values after warmup
26+
// a backup adapter, if you set values after warm-up
2727
new FilesystemAdapter()
2828
);
2929
$cache->warmUp($values);

components/cache/adapters/redis_adapter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ try to add data when no memory is available. An example setting could look as fo
205205
maxmemory 100mb
206206
maxmemory-policy allkeys-lru
207207
208-
Read more about this topic in the offical `Redis LRU Cache Documentation`_.
208+
Read more about this topic in the official `Redis LRU Cache Documentation`_.
209209

210210
.. _`Data Source Name (DSN)`: https://en.wikipedia.org/wiki/Data_source_name
211211
.. _`Redis server`: https://redis.io/

components/cache/cache_invalidation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Cache Invalidation
77

88
Cache invalidation is the process of removing all cached items related to a
99
change in the state of your model. The most basic kind of invalidation is direct
10-
items deletion. But when the state of a primary resource has spread across
10+
item deletion. But when the state of a primary resource has spread across
1111
several cached items, keeping them in sync can be difficult.
1212

1313
The Symfony Cache component provides two mechanisms to help solve this problem:
@@ -47,7 +47,7 @@ you can invalidate the cached items by calling
4747
// if you know the cache key, you can also delete the item directly
4848
$cache->delete('cache_key');
4949

50-
Using tags invalidation is very useful when tracking cache keys becomes difficult.
50+
Using tag invalidation is very useful when tracking cache keys becomes difficult.
5151

5252
Tag Aware Adapters
5353
~~~~~~~~~~~~~~~~~~

components/http_foundation/sessions.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Quick example::
5353
.. caution::
5454

5555
Symfony sessions are incompatible with ``php.ini`` directive ``session.auto_start = 1``
56-
This directive should be turned off in ``php.ini``, in the webserver directives or
56+
This directive should be turned off in ``php.ini``, in the web server directives or
5757
in ``.htaccess``.
5858

5959
Session API
@@ -152,7 +152,7 @@ the following API which is intended mainly for internal purposes:
152152
Returns the name of the session bag.
153153

154154
:method:`Symfony\\Component\\HttpFoundation\\Session\\SessionBagInterface::clear`
155-
Clears out data from bag.
155+
Clears out data from the bag.
156156

157157
.. _attribute-bag-interface:
158158

@@ -301,7 +301,7 @@ has the API
301301
Gets flashes by type (read only).
302302

303303
:method:`Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface::peekAll`
304-
Gets all flashes (read only) as keyed array of arrays.
304+
Gets all flashes (read only) as a keyed array of arrays.
305305

306306
:method:`Symfony\\Component\\HttpFoundation\\Session\\Flash\\FlashBagInterface::has`
307307
Returns true if the type exists, false if not.

components/security/authentication.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ Authentication Success and Failure Events
299299
When a provider authenticates the user, a ``security.authentication.success``
300300
event is dispatched. But beware - this event may fire, for example, on *every*
301301
request if you have session-based authentication, if ``always_authenticate_before_granting``
302-
is enabled or if token is not authenticated before AccessListener is invoked.
302+
is enabled or if the token is not authenticated before AccessListener is invoked.
303303
See ``security.interactive_login`` below if you need to do something when a user *actually* logs in.
304304

305305
When a provider attempts authentication but fails (i.e. throws an ``AuthenticationException``),
@@ -324,7 +324,7 @@ The ``security.switch_user`` event is triggered every time you activate
324324
the ``switch_user`` firewall listener.
325325

326326
The ``Symfony\Component\Security\Http\Event\DeauthenticatedEvent`` event is triggered when a token has been deauthenticated
327-
because of a user change, it can help you doing some clean-up task.
327+
because of a user change. It can help you perform clean-up tasks.
328328

329329
.. seealso::
330330

components/yaml/yaml_format.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ they can also be unquoted:
2525
2626
A string in YAML
2727
28-
'A singled-quoted string in YAML'
28+
'A single-quoted string in YAML'
2929
3030
"A double-quoted string in YAML"
3131

configuration/env_var_processors.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,8 +583,8 @@ Symfony provides the following env var processors:
583583
$container->setParameter('private_key', '%env(default:raw_key:file:PRIVATE_KEY)%');
584584
$container->setParameter('raw_key', '%env(PRIVATE_KEY)%');
585585
586-
When the fallback parameter is omitted (e.g. ``env(default::API_KEY)``), the
587-
value returned is ``null``.
586+
When the fallback parameter is omitted (e.g. ``env(default::API_KEY)``), then the
587+
returned value is ``null``.
588588

589589
``env(url:FOO)``
590590
Parses an absolute URL and returns its components as an associative array.

configuration/front_controllers_and_kernel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ should run in "debug mode". Regardless of the
135135
:ref:`configuration environment <configuration-environments>`, a Symfony
136136
application can be run with debug mode set to ``true`` or ``false``.
137137

138-
This affects many things in the application, such as displaying stacktraces on
138+
This affects many things in the application, such as displaying stack traces on
139139
error pages or if cache files are dynamically rebuilt on each request. Though
140140
not a requirement, debug mode is generally set to ``true`` for the ``dev`` and
141141
``test`` environments and ``false`` for the ``prod`` environment.

configuration/multiple_kernels.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Now you need to define the ``ApiKernel`` class used by the new front controller.
7777
The easiest way to do this is by duplicating the existing ``src/Kernel.php``
7878
file and make the needed changes.
7979

80-
In this example, the ``ApiKernel`` will load less bundles than the default
80+
In this example, the ``ApiKernel`` will load fewer bundles than the default
8181
Kernel. Be sure to also change the location of the cache, logs and configuration
8282
files so they don't collide with the files from ``src/Kernel.php``::
8383

controller/soap_web_service.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ buffering the STDOUT and use ``ob_get_clean()`` to dump the echoed output
9595
into the content of the Response and clear the output buffer. Finally, you're
9696
ready to return the ``Response``.
9797

98-
Below is an example calling the service using a native `SoapClient`_ client. This example
98+
Below is an example of calling the service using a native `SoapClient`_ client. This example
9999
assumes that the ``index()`` method in the controller above is accessible via
100100
the route ``/soap``::
101101

http_cache.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Symfony Reverse Proxy
7171

7272
Symfony comes with a reverse proxy (i.e. gateway cache) written in PHP.
7373
:ref:`It's not a fully-featured reverse proxy cache like Varnish <http-cache-symfony-versus-varnish>`,
74-
but is a great way to start.
74+
but it is a great way to start.
7575

7676
.. tip::
7777

http_client.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,7 @@ response sequentially instead of waiting for the entire response::
10201020
``php://temp`` stream. You can control this behavior by using the ``buffer``
10211021
option: set it to ``true``/``false`` to enable/disable buffering, or to a
10221022
closure that should return the same based on the response headers it receives
1023-
as argument.
1023+
as an argument.
10241024

10251025
Canceling Responses
10261026
~~~~~~~~~~~~~~~~~~~
@@ -1190,7 +1190,7 @@ method will yield a special chunk whose ``isTimeout()`` will return ``true``::
11901190

11911191
foreach ($client->stream($responses, 1.5) as $response => $chunk) {
11921192
if ($chunk->isTimeout()) {
1193-
// $response staled for more than 1.5 seconds
1193+
// $response stale for more than 1.5 seconds
11941194
}
11951195
}
11961196

lock.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ When a program runs concurrently, some part of code which modify shared
88
resources should not be accessed by multiple processes at the same time.
99
Symfony's :doc:`Lock component </components/lock>` provides a locking mechanism to ensure
1010
that only one process is running the critical section of code at any point of
11-
time to prevent race condition from happening.
11+
time to prevent race conditions from happening.
1212

1313
The following example shows a typical usage of the lock::
1414

@@ -199,7 +199,7 @@ Locking a Dynamic Resource
199199
--------------------------
200200

201201
Sometimes the application is able to cut the resource into small pieces in order
202-
to lock a small subset of process and let other through. The previous example
202+
to lock a small subset of processes and let others through. The previous example
203203
showed how to lock the ``$pdf->getOrCreatePdf('terms-of-use')`` for everybody,
204204
now let's see how to lock ``$pdf->getOrCreatePdf($version)`` only for
205205
processes asking for the same ``$version``::

logging.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ defined.
165165
If you want to override the ``monolog`` configuration via another config
166166
file, you will need to redefine the entire ``handlers`` stack. The configuration
167167
from the two files cannot be merged because the order matters and a merge does
168-
not allow to control the order.
168+
not allow you to control the order.
169169

170170
Handlers that Modify Log Entries
171171
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

testing.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ After the library is installed, try running PHPUnit:
2929
3030
$ php ./vendor/bin/phpunit
3131
32-
This commands automatically runs your application's tests. Each test is a
32+
This command automatically runs your application tests. Each test is a
3333
PHP class ending with "Test" (e.g. ``BlogControllerTest``) that lives in
3434
the ``tests/`` directory of your application.
3535

@@ -147,7 +147,7 @@ usually defined in the ``KERNEL_CLASS`` environment variable
147147

148148
If your use case is more complex, you can also override the
149149
``getKernelClass()`` or ``createKernel()`` methods of your functional
150-
test, which take precedence over the ``KERNEL_CLASS`` env var.
150+
test, which takes precedence over the ``KERNEL_CLASS`` env var.
151151

152152
Set-up your Test Environment
153153
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -378,7 +378,7 @@ generate an empty fixture class:
378378
The class name of the fixtures to create (e.g. AppFixtures):
379379
> ProductFixture
380380
381-
Then you modify use this class to load new entities in the database. For
381+
Then you modify and use this class to load new entities in the database. For
382382
instance, to load ``Product`` objects into Doctrine, use::
383383

384384
// src/DataFixtures/ProductFixture.php
@@ -911,7 +911,7 @@ Request Assertions
911911
Asserts the given :ref:`request attribute <component-foundation-attributes>`
912912
is set to the expected value.
913913
``assertRouteSame($expectedRoute, array $parameters = [], string $message = '')``
914-
Asserts the request matched the given route and optionally route parameters.
914+
Asserts the request matches the given route and optionally route parameters.
915915

916916
Browser Assertions
917917
..................
@@ -974,7 +974,7 @@ Mailer Assertions
974974
``assertEmailAttachmentCount(RawMessage $email, int $count, string $message = '')``
975975
Asserts that the given email has the expected number of attachments. Use
976976
``getMailerMessage(int $index = 0, string $transport = null)`` to
977-
retrievea specific email by index.
977+
retrieve a specific email by index.
978978
``assertEmailTextBodyContains(RawMessage $email, string $text, string $message = '')``/``assertEmailTextBodyNotContains(RawMessage $email, string $text, string $message = '')``
979979
Asserts that the text body of the given email does (not) contain the
980980
expected text.

0 commit comments

Comments
 (0)