Skip to content

Commit c50db62

Browse files
committed
Merge branch '5.4' into 6.2
* 5.4: [Contributing] Fix some minor typos [FrameworkBundle] Fix a minor syntax issue
2 parents b252406 + 57ce0f4 commit c50db62

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

contributing/code/bc.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ Change argument type
403403
Add return type No
404404
Remove return type No
405405
Change return type No
406-
**Static Methods and Properties**
406+
**Static Methods and Properties**
407407
Turn non static into static No
408408
Turn static into non static No
409409
=============================================================================== ============== ===============
@@ -472,10 +472,10 @@ Making Code Changes in a Backward Compatible Way
472472
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
473473

474474
As you read above, many changes are not allowed because they would represent a
475-
backward compability break. However, we want to be able to improve the code and
475+
backward compatibility break. However, we want to be able to improve the code and
476476
its features over time and that can be done thanks to some strategies that
477477
allow to still do some unallowed changes in several steps that ensure backward
478-
compability and a smooth upgrade path. Some of them are described in the next
478+
compatibility and a smooth upgrade path. Some of them are described in the next
479479
sections.
480480

481481
.. _add-argument-public-method:

reference/configuration/framework.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ instance), the host might have been manipulated by an attacker.
476476

477477
.. seealso::
478478

479-
You can read "`HTTP Host header attacks`_" for more information about
479+
You can read `HTTP Host header attacks`_ for more information about
480480
these kinds of attacks.
481481

482482
The Symfony :method:`Request::getHost() <Symfony\\Component\\HttpFoundation\\Request::getHost>`

0 commit comments

Comments
 (0)