Skip to content

Commit 02d3d1a

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: [Cache] Remove `compression` option from Redis and Memcache Reword Update env_var_processors.rst [Translation] Update translation.rst [Messenger] Added note about timezone
2 parents 947fbd1 + 81e245b commit 02d3d1a

File tree

5 files changed

+10
-21
lines changed

5 files changed

+10
-21
lines changed

components/cache/adapters/memcached_adapter.rst

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ option names and their respective values::
120120

121121
// associative array of configuration options
122122
[
123-
'compression' => true,
124123
'libketama_compatible' => true,
125124
'serializer' => 'igbinary',
126125
]
@@ -139,17 +138,6 @@ Available Options
139138
server(s). Any action that retrieves data, quits the connection, or closes
140139
down the connection will cause the buffer to be committed.
141140

142-
``compression`` (type: ``bool``, default: ``true``)
143-
Enables or disables payload compression, where item values longer than 100
144-
bytes are compressed during storage and decompressed during retrieval.
145-
146-
``compression_type`` (type: ``string``)
147-
Specifies the compression method used on value payloads. when the
148-
**compression** option is enabled.
149-
150-
Valid option values include ``fastlz`` and ``zlib``, with a default value
151-
that *varies based on flags used at compilation*.
152-
153141
``connect_timeout`` (type: ``int``, default: ``1000``)
154142
Specifies the timeout (in milliseconds) of socket connection operations when
155143
the ``no_block`` option is enabled.

components/cache/adapters/redis_adapter.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ array of ``key => value`` pairs representing option names and their respective v
123123

124124
// associative array of configuration options
125125
[
126-
'compression' => true,
127126
'lazy' => false,
128127
'persistent' => 0,
129128
'persistent_id' => null,
@@ -143,10 +142,6 @@ Available Options
143142
If none is specified, it will return ``\Redis`` if the ``redis`` extension is
144143
available, and ``\Predis\Client`` otherwise.
145144

146-
``compression`` (type: ``bool``, default: ``true``)
147-
Enables or disables compression of items. This requires phpredis v4 or higher with
148-
LZF support enabled.
149-
150145
``lazy`` (type: ``bool``, default: ``false``)
151146
Enables or disables lazy connections to the backend. It's ``false`` by
152147
default when using this as a stand-alone component and ``true`` by default

configuration/env_var_processors.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ Symfony provides the following env var processors:
287287
288288
# config/packages/framework.yaml
289289
parameters:
290-
env(TRUSTED_HOSTS): "10.0.0.1, 10.0.0.2"
290+
env(TRUSTED_HOSTS): "10.0.0.1,10.0.0.2"
291291
framework:
292292
trusted_hosts: '%env(csv:TRUSTED_HOSTS)%'
293293
@@ -304,7 +304,7 @@ Symfony provides the following env var processors:
304304
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
305305
306306
<parameters>
307-
<parameter key="env(TRUSTED_HOSTS)">["10.0.0.1", "10.0.0.2"]</parameter>
307+
<parameter key="env(TRUSTED_HOSTS)">10.0.0.1,10.0.0.2</parameter>
308308
</parameters>
309309
310310
<framework:config trusted-hosts="%env(csv:TRUSTED_HOSTS)%"/>
@@ -313,7 +313,7 @@ Symfony provides the following env var processors:
313313
.. code-block:: php
314314
315315
// config/packages/framework.php
316-
$container->setParameter('env(TRUSTED_HOSTS)', '["10.0.0.1", "10.0.0.2"]');
316+
$container->setParameter('env(TRUSTED_HOSTS)', '10.0.0.1,10.0.0.2');
317317
$container->loadFromExtension('framework', [
318318
'trusted_hosts' => '%env(csv:TRUSTED_HOSTS)%',
319319
]);

messenger.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,6 +1093,12 @@ auto_setup Whether the table should be created
10931093
automatically during send / get. true
10941094
================== ===================================== ======================
10951095

1096+
.. caution::
1097+
1098+
The datetime property of the messages stored in the database uses the
1099+
timezone of the current system. This may cause issues if multiple machines
1100+
with different timezone configuration use the same storage.
1101+
10961102
Beanstalkd Transport
10971103
~~~~~~~~~~~~~~~~~~~~
10981104

translation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ The ``translation:update`` command looks for missing translations in:
385385
defined in the :ref:`twig.default_path <config-twig-default-path>` and
386386
:ref:`twig.paths <config-twig-paths>` config options);
387387
* Any PHP file/class that injects or :doc:`autowires </service_container/autowiring>`
388-
the ``translator`` service and makes calls to the ``trans()`` function.
388+
the ``translator`` service and makes calls to the ``trans()`` method.
389389

390390
.. _translation-resource-locations:
391391

0 commit comments

Comments
 (0)