Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 76bc4b1

Browse filesBrowse files
committed
Merge branch '5.2' into 5.x
* 5.2: [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 3bd2e76 + 02d3d1a commit 76bc4b1
Copy full SHA for 76bc4b1

File tree

5 files changed

+10
-21
lines changed
Filter options

5 files changed

+10
-21
lines changed

‎components/cache/adapters/memcached_adapter.rst

Copy file name to clipboardExpand all lines: components/cache/adapters/memcached_adapter.rst
-12Lines 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

Copy file name to clipboardExpand all lines: components/cache/adapters/redis_adapter.rst
-5Lines 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

Copy file name to clipboardExpand all lines: configuration/env_var_processors.rst
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ Symfony provides the following env var processors:
327327
328328
# config/packages/framework.yaml
329329
parameters:
330-
env(TRUSTED_HOSTS): "10.0.0.1, 10.0.0.2"
330+
env(TRUSTED_HOSTS): "10.0.0.1,10.0.0.2"
331331
framework:
332332
trusted_hosts: '%env(csv:TRUSTED_HOSTS)%'
333333
@@ -344,7 +344,7 @@ Symfony provides the following env var processors:
344344
https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
345345
346346
<parameters>
347-
<parameter key="env(TRUSTED_HOSTS)">["10.0.0.1", "10.0.0.2"]</parameter>
347+
<parameter key="env(TRUSTED_HOSTS)">10.0.0.1,10.0.0.2</parameter>
348348
</parameters>
349349
350350
<framework:config trusted-hosts="%env(csv:TRUSTED_HOSTS)%"/>
@@ -353,7 +353,7 @@ Symfony provides the following env var processors:
353353
.. code-block:: php
354354
355355
// config/packages/framework.php
356-
$container->setParameter('env(TRUSTED_HOSTS)', '["10.0.0.1", "10.0.0.2"]');
356+
$container->setParameter('env(TRUSTED_HOSTS)', '10.0.0.1,10.0.0.2');
357357
$container->loadFromExtension('framework', [
358358
'trusted_hosts' => '%env(csv:TRUSTED_HOSTS)%',
359359
]);

‎messenger.rst

Copy file name to clipboardExpand all lines: messenger.rst
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,6 +1126,12 @@ auto_setup Whether the table should be created
11261126
automatically during send / get. true
11271127
================== ===================================== ======================
11281128

1129+
.. caution::
1130+
1131+
The datetime property of the messages stored in the database uses the
1132+
timezone of the current system. This may cause issues if multiple machines
1133+
with different timezone configuration use the same storage.
1134+
11291135
Beanstalkd Transport
11301136
~~~~~~~~~~~~~~~~~~~~
11311137

‎translation.rst

Copy file name to clipboardExpand all lines: translation.rst
+1-1Lines 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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.