Skip to content

Commit a980d5c

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: Add a note about updating phpdoc in a patch release The wrong type is used for autowiring
2 parents 7fe811e + efb4ecb commit a980d5c

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

contributing/code/maintenance.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,9 @@ issue):
6767
* **Adding new deprecations**: After a version reaches stability, new
6868
deprecations cannot be added anymore.
6969

70+
* **Adding or updating annotations**: Adding or updating annotations (PHPDoc
71+
annotations for instance) is not allowed; fixing them might be accepted.
72+
7073
Anything not explicitly listed above should be done on the next minor or major
7174
version instead. For instance, the following changes are never accepted in a
7275
patch version:

security/impersonating_user.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ logic you want::
383383
class SwitchToCustomerVoter extends Voter
384384
{
385385
public function __construct(
386-
private AccessDecisionManager $accessDecisionManager,
386+
private AccessDecisionManagerInterface $accessDecisionManager,
387387
) {
388388
}
389389

0 commit comments

Comments
 (0)