Skip to content

Commit bed9222

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Fixing storage_factory_id Fix broken reference to CommandCompletionTester class Revert minor change [Security] update strategy number Add information about flex plugin allowance [Security] Update security.rst
2 parents 312e259 + 53496ba commit bed9222

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

bundles/best_practices.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ with Symfony Flex to install a specific Symfony version:
235235
export SYMFONY_REQUIRE=5.*
236236
237237
# install Symfony Flex in the CI environment
238+
composer global config --no-plugins allow-plugins.symfony/flex true
238239
composer global require --no-progress --no-scripts --no-plugins symfony/flex
239240
240241
# install the dependencies (using --prefer-dist and --no-progress is

console/input.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ Testing the Completion script
371371
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
372372

373373
The Console component comes with a special
374-
:class:`Symfony\\Component\\Console\\Test\\CommandCompletionTester`` class
374+
:class:`Symfony\\Component\\Console\\Tester\\CommandCompletionTester`` class
375375
to help you unit test the completion logic::
376376

377377
// ...

security/voters.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ checks if the user is a member of the site and a second one that checks if the u
271271
is older than 18.
272272

273273
To handle these cases, the access decision manager uses a "strategy" which you can configure.
274-
There are three strategies available:
274+
There are four strategies available:
275275

276276
``affirmative`` (default)
277277
This grants access as soon as there is *one* voter granting access;

session.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ sessions, check their default configuration:
7171
// improves the security of the cookies used for sessions
7272
->cookieSecure('auto')
7373
->cookieSamesite(Cookie::SAMESITE_LAX)
74-
->storage_factory_id('session.storage.factory.native')
74+
->storageFactoryId('session.storage.factory.native')
7575
;
7676
};
7777

0 commit comments

Comments
 (0)