Skip to content

Commit b08f936

Browse files
committed
Merge branch '6.4' into 7.2
* 6.4: Minor tweaks remove reference to Travis CI (no longer free) [Reference] Update the default values of some options
2 parents bed083c + 347989e commit b08f936

File tree

2 files changed

+23
-25
lines changed

2 files changed

+23
-25
lines changed

bundles/best_practices.rst

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -195,25 +195,24 @@ Continuous Integration
195195

196196
Testing bundle code continuously, including all its commits and pull requests,
197197
is a good practice called Continuous Integration. There are several services
198-
providing this feature for free for open source projects, like `GitHub Actions`_
199-
and `Travis CI`_.
198+
providing this feature for free for open source projects, like `GitHub Actions`_.
200199

201200
A bundle should at least test:
202201

203202
* The lower bound of their dependencies (by running ``composer update --prefer-lowest``);
204203
* The supported PHP versions;
205-
* All supported major Symfony versions (e.g. both ``4.x`` and ``5.x`` if
204+
* All supported major Symfony versions (e.g. both ``6.4`` and ``7.x`` if
206205
support is claimed for both).
207206

208-
Thus, a bundle supporting PHP 7.3, 7.4 and 8.0, and Symfony 4.4 and 5.x should
207+
Thus, a bundle supporting PHP 7.4, 8.3 and 8.4, and Symfony 6.4 and 7.x should
209208
have at least this test matrix:
210209

211210
=========== =============== ===================
212211
PHP version Symfony version Composer flags
213212
=========== =============== ===================
214-
7.3 ``4.*`` ``--prefer-lowest``
215-
7.4 ``5.*``
216-
8.0 ``5.*``
213+
7.4 ``6.4`` ``--prefer-lowest``
214+
8.3 ``7.*``
215+
8.4 ``7.*``
217216
=========== =============== ===================
218217

219218
.. tip::
@@ -233,10 +232,10 @@ with Symfony Flex to install a specific Symfony version:
233232

234233
.. code-block:: bash
235234
236-
# this requires Symfony 5.x for all Symfony packages
237-
export SYMFONY_REQUIRE=5.*
235+
# this requires Symfony 6.x for all Symfony packages
236+
export SYMFONY_REQUIRE=6.*
238237
# alternatively you can run this command to update composer.json config
239-
# composer config extra.symfony.require "5.*"
238+
# composer config extra.symfony.require "6.*"
240239
241240
# install Symfony Flex in the CI environment
242241
composer global config --no-plugins allow-plugins.symfony/flex true
@@ -568,4 +567,3 @@ Learn more
568567
.. _`choose any license`: https://choosealicense.com/
569568
.. _`valid license identifier`: https://spdx.org/licenses/
570569
.. _`GitHub Actions`: https://docs.github.com/en/free-pro-team@latest/actions
571-
.. _`Travis CI`: https://docs.travis-ci.com/

reference/configuration/framework.rst

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@ allow_reload
12431243

12441244
Specifies whether the client can force a cache reload by including a
12451245
Cache-Control "no-cache" directive in the request. Set it to ``true``
1246-
for compliance with RFC 2616. (default: false)
1246+
for compliance with RFC 2616.
12471247

12481248
allow_revalidate
12491249
................
@@ -1252,7 +1252,7 @@ allow_revalidate
12521252

12531253
Specifies whether the client can force a cache revalidate by including a
12541254
Cache-Control "max-age=0" directive in the request. Set it to ``true``
1255-
for compliance with RFC 2616. (default: false)
1255+
for compliance with RFC 2616.
12561256

12571257
debug
12581258
.....
@@ -1265,11 +1265,11 @@ try to carry on and deliver a meaningful response.
12651265
default_ttl
12661266
...........
12671267

1268-
**type**: ``integer``
1268+
**type**: ``integer`` **default**: ``0``
12691269

12701270
The number of seconds that a cache entry should be considered fresh when no
12711271
explicit freshness information is provided in a response. Explicit
1272-
Cache-Control or Expires headers override this value. (default: 0)
1272+
Cache-Control or Expires headers override this value.
12731273

12741274
enabled
12751275
.......
@@ -1279,11 +1279,11 @@ enabled
12791279
private_headers
12801280
...............
12811281

1282-
**type**: ``array``
1282+
**type**: ``array`` **default**: ``['Authorization', 'Cookie']``
12831283

12841284
Set of request headers that trigger "private" cache-control behavior on responses
12851285
that don't explicitly state whether the response is public or private via a
1286-
Cache-Control directive. (default: Authorization and Cookie)
1286+
Cache-Control directive.
12871287

12881288
skip_response_headers
12891289
.....................
@@ -1296,30 +1296,30 @@ and public.
12961296
stale_if_error
12971297
..............
12981298

1299-
**type**: ``integer``
1299+
**type**: ``integer`` **default**: ``60``
13001300

13011301
Specifies the default number of seconds (the granularity is the second) during
1302-
which the cache can serve a stale response when an error is encountered
1303-
(default: 60). This setting is overridden by the stale-if-error HTTP
1302+
which the cache can serve a stale response when an error is encountered.
1303+
This setting is overridden by the stale-if-error HTTP
13041304
Cache-Control extension (see RFC 5861).
13051305

13061306
stale_while_revalidate
13071307
......................
13081308

1309-
**type**: ``integer``
1309+
**type**: ``integer`` **default**: ``2``
13101310

13111311
Specifies the default number of seconds (the granularity is the second as the
13121312
Response TTL precision is a second) during which the cache can immediately return
1313-
a stale response while it revalidates it in the background (default: 2).
1313+
a stale response while it revalidates it in the background.
13141314
This setting is overridden by the stale-while-revalidate HTTP Cache-Control
13151315
extension (see RFC 5861).
13161316

13171317
trace_header
13181318
............
13191319

1320-
**type**: ``string``
1320+
**type**: ``string`` **default**: ``'X-Symfony-Cache'``
13211321

1322-
Header name to use for traces. (default: X-Symfony-Cache)
1322+
Header name to use for traces.
13231323

13241324
trace_level
13251325
...........
@@ -1328,7 +1328,7 @@ trace_level
13281328

13291329
For 'short', a concise trace of the main request will be added as an HTTP header.
13301330
'full' will add traces for all requests (including ESI subrequests).
1331-
(default: 'full' if in debug; 'none' otherwise)
1331+
(default: ``'full'`` if in debug; ``'none'`` otherwise)
13321332

13331333
.. _reference-http-client:
13341334

0 commit comments

Comments
 (0)