Skip to content

Commit 57059db

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: fix: minor array fix/adjustment.
2 parents 37b3fef + 5cbfbeb commit 57059db

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

doctrine/multiple_entity_managers.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -156,23 +156,23 @@ The following configuration code shows how you can configure two entity managers
156156
'connection' => 'default',
157157
'mappings' => [
158158
'Main' => [
159-
is_bundle => false,
160-
type => 'annotation',
161-
dir => '%kernel.project_dir%/src/Entity/Main',
162-
prefix => 'App\Entity\Main',
163-
alias => 'Main',
159+
'is_bundle' => false,
160+
'type' => 'annotation',
161+
'dir' => '%kernel.project_dir%/src/Entity/Main',
162+
'prefix' => 'App\Entity\Main',
163+
'alias' => 'Main',
164164
]
165165
],
166166
],
167167
'customer' => [
168168
'connection' => 'customer',
169169
'mappings' => [
170170
'Customer' => [
171-
is_bundle => false,
172-
type => 'annotation',
173-
dir => '%kernel.project_dir%/src/Entity/Customer',
174-
prefix => 'App\Entity\Customer',
175-
alias => 'Customer',
171+
'is_bundle' => false,
172+
'type' => 'annotation',
173+
'dir' => '%kernel.project_dir%/src/Entity/Customer',
174+
'prefix' => 'App\Entity\Customer',
175+
'alias' => 'Customer',
176176
]
177177
],
178178
],

security.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,10 @@ important section is ``firewalls``:
279279
],
280280
]);
281281
282+
.. versionadded:: 4.4
283+
284+
The ``anonymous: lazy`` option was introduced in Symfony 4.4.
285+
282286
A "firewall" is your authentication system: the configuration below it defines
283287
*how* your users will be able to authenticate (e.g. login form, API token, etc).
284288

0 commit comments

Comments
 (0)