Skip to content

Commit 49cd53b

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: Minor tweak Fix markdown in multiple_entity_managers.rst [Intl] Remove duplicated parentheses Update bc.rst
2 parents ea612d5 + 9956ba7 commit 49cd53b

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

components/intl.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -353,8 +353,8 @@ arguments to get the offset at any given point in time::
353353
The string representation of the GMT offset can vary depending on the locale, so
354354
you can pass the locale as the third optional argument::
355355

356-
$offset = Timezones::getGmtOffset('Europe/Madrid', strtotime('October 28, 2019'), 'ar')); // $offset = 'غرينتش+01:00'
357-
$offset = Timezones::getGmtOffset('Europe/Madrid', strtotime('October 28, 2019'), 'dz')); // $offset = 'ཇི་ཨེམ་ཏི་+01:00'
356+
$offset = Timezones::getGmtOffset('Europe/Madrid', strtotime('October 28, 2019'), 'ar'); // $offset = 'غرينتش+01:00'
357+
$offset = Timezones::getGmtOffset('Europe/Madrid', strtotime('October 28, 2019'), 'dz'); // $offset = 'ཇི་ཨེམ་ཏི་+01:00'
358358

359359
If the given timezone ID doesn't exist, the methods trigger a
360360
:class:`Symfony\\Component\\Intl\\Exception\\MissingResourceException`. In addition

contributing/code/bc.rst

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ Our Backward Compatibility Promise
44
Ensuring smooth upgrades of your projects is our first priority. That's why
55
we promise you backward compatibility (BC) for all minor Symfony releases.
66
You probably recognize this strategy as `Semantic Versioning`_. In short,
7-
Semantic Versioning means that only major releases (such as 2.0, 3.0 etc.) are
8-
allowed to break backward compatibility. Minor releases (such as 2.5, 2.6 etc.)
7+
Semantic Versioning means that only major releases (such as 5.0, 6.0 etc.) are
8+
allowed to break backward compatibility. Minor releases (such as 5.1, 5.2 etc.)
99
may introduce new features, but must do so without breaking the existing API of
10-
that release branch (2.x in the previous example).
10+
that release branch (5.x in the previous example).
11+
12+
We also provide deprecation message triggered in the code base to help you with
13+
the migration process across major release.
1114

1215
.. caution::
1316

doctrine/multiple_entity_managers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,6 @@ The same applies to repository calls::
320320
// ...
321321
}
322322

323-
You should now always fetch this repository using ``ManagerRegistry::getRepository()``.
323+
You should now always fetch this repository using ``ManagerRegistry::getRepository()``.
324324

325325
.. _`several alternatives`: https://stackoverflow.com/a/11494543

0 commit comments

Comments
 (0)