Skip to content

Commit fe572cc

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: Prepare for 3.4 end of life
2 parents faef012 + 12bc66d commit fe572cc

File tree

8 files changed

+39
-41
lines changed

8 files changed

+39
-41
lines changed

README.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Symfony documentation, please read
1111
[Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
1212

1313
> **Note**
14-
> All pull requests must be based off of the **3.4** branch,
15-
> unless you're documenting a feature that was introduced *after* Symfony 3.4
16-
> (e.g. in Symfony 4.4), **not** the master or older branches.
14+
> All pull requests must be based off of the **4.4** branch,
15+
> unless you're documenting a feature that was introduced *after* Symfony 4.4
16+
> (e.g. in Symfony 5.2), **not** the ``5.x`` or older branches.
1717
1818
SymfonyCloud
1919
------------

components/cache/adapters/filesystem_adapter.rst

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,9 @@ and cache root path as constructor parameters::
5050

5151
.. note::
5252

53-
Since Symfony 3.4, this adapter implements
54-
:class:`Symfony\\Component\\Cache\\PruneableInterface`, enabling manual
55-
:ref:`pruning of expired cache items <component-cache-cache-pool-prune>` by
56-
calling its ``prune()`` method.
57-
53+
This adapter implements :class:`Symfony\\Component\\Cache\\PruneableInterface`,
54+
enabling manual :ref:`pruning of expired cache items <component-cache-cache-pool-prune>`
55+
by calling its ``prune()`` method.
5856

5957
.. _filesystem-tag-aware-adapter:
6058

components/cache/adapters/pdo_doctrine_dbal_adapter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ your code.
4444

4545
.. note::
4646

47-
Since Symfony 3.4, this adapter implements :class:`Symfony\\Component\\Cache\\PruneableInterface`,
47+
This adapter implements :class:`Symfony\\Component\\Cache\\PruneableInterface`,
4848
allowing for manual :ref:`pruning of expired cache entries <component-cache-cache-pool-prune>` by
4949
calling its ``prune()`` method.
5050

components/cache/adapters/php_files_adapter.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ directory path as constructor arguments::
6363

6464
.. note::
6565

66-
Since Symfony 3.4, this adapter implements :class:`Symfony\\Component\\Cache\\PruneableInterface`,
66+
This adapter implements :class:`Symfony\\Component\\Cache\\PruneableInterface`,
6767
allowing for manual :ref:`pruning of expired cache entries <component-cache-cache-pool-prune>` by
6868
calling its ``prune()`` method.
6969

components/cache/cache_invalidation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ your fronts and have very fast invalidation checks::
8787

8888
.. note::
8989

90-
Since Symfony 3.4, :class:`Symfony\\Component\\Cache\\Adapter\\TagAwareAdapter`
90+
:class:`Symfony\\Component\\Cache\\Adapter\\TagAwareAdapter`
9191
implements :class:`Symfony\\Component\\Cache\\PruneableInterface`,
9292
enabling manual
9393
:ref:`pruning of expired cache entries <component-cache-cache-pool-prune>` by

contributing/code/pull_requests.rst

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -124,24 +124,24 @@ Choose the right Branch
124124
Before working on a PR, you must determine on which branch you need to
125125
work:
126126

127-
* ``3.4``, if you are fixing a bug for an existing feature or want to make a
127+
* ``4.4``, if you are fixing a bug for an existing feature or want to make a
128128
change that falls into the :doc:`list of acceptable changes in patch versions
129129
</contributing/code/maintenance>` (you may have to choose a higher branch if
130130
the feature you are fixing was introduced in a later version);
131131

132132
* ``5.x``, if you are adding a new feature.
133133

134134
The only exception is when a new :doc:`major Symfony version </contributing/community/releases>`
135-
(4.0, 5.0, etc.) comes out every two years. Because of the
135+
(5.0, 6.0, etc.) comes out every two years. Because of the
136136
:ref:`special development process <major-version-development>` of those versions,
137-
you need to use the previous minor version for the features (e.g. use ``3.4``
138-
instead of ``4.0``, use ``4.4`` instead of ``5.0``, etc.)
137+
you need to use the previous minor version for the features (e.g. use ``4.4``
138+
instead of ``5.0``, use ``5.4`` instead of ``6.0``, etc.)
139139

140140
.. note::
141141

142142
All bug fixes merged into maintenance branches are also merged into more
143143
recent branches on a regular basis. For instance, if you submit a PR
144-
for the ``3.4`` branch, the PR will also be applied by the core team on
144+
for the ``4.4`` branch, the PR will also be applied by the core team on
145145
the ``5.x`` branch.
146146

147147
Create a Topic Branch
@@ -154,18 +154,18 @@ topic branch:
154154
155155
$ git checkout -b BRANCH_NAME 5.x
156156
157-
Or, if you want to provide a bug fix for the ``3.4`` branch, first track the remote
158-
``3.4`` branch locally:
157+
Or, if you want to provide a bug fix for the ``4.4`` branch, first track the remote
158+
``4.4`` branch locally:
159159

160160
.. code-block:: terminal
161161
162-
$ git checkout --track origin/3.4
162+
$ git checkout --track origin/4.4
163163
164-
Then create a new branch off the ``3.4`` branch to work on the bug fix:
164+
Then create a new branch off the ``4.4`` branch to work on the bug fix:
165165

166166
.. code-block:: terminal
167167
168-
$ git checkout -b BRANCH_NAME 3.4
168+
$ git checkout -b BRANCH_NAME 4.4
169169
170170
.. tip::
171171

@@ -285,7 +285,7 @@ while to finish your changes):
285285
286286
.. tip::
287287

288-
Replace ``5.x`` with the branch you selected previously (e.g. ``3.4``)
288+
Replace ``5.x`` with the branch you selected previously (e.g. ``4.4``)
289289
if you are working on a bug fix.
290290

291291
When doing the ``rebase`` command, you might have to fix merge conflicts.
@@ -312,8 +312,8 @@ You can now make a pull request on the ``symfony/symfony`` GitHub repository.
312312

313313
.. tip::
314314

315-
Take care to point your pull request towards ``symfony:3.4`` if you want
316-
the core team to pull a bug fix based on the ``3.4`` branch.
315+
Take care to point your pull request towards ``symfony:4.4`` if you want
316+
the core team to pull a bug fix based on the ``4.4`` branch.
317317

318318
To ease the core team work, always include the modified components in your
319319
pull request message, like in:
@@ -403,7 +403,7 @@ Rework your Pull Request
403403

404404
Based on the feedback on the pull request, you might need to rework your
405405
PR. Before re-submitting the PR, rebase with ``upstream/5.x`` or
406-
``upstream/3.4``, don't merge; and force the push to the origin:
406+
``upstream/4.4``, don't merge; and force the push to the origin:
407407

408408
.. code-block:: terminal
409409

contributing/community/releases.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ release and maintain its different versions.
77
Symfony releases follow the `semantic versioning`_ strategy and they are
88
published through a *time-based model*:
99

10-
* A new **Symfony patch version** (e.g. 4.4.9, 5.0.9, 5.1.1) comes out roughly every
10+
* A new **Symfony patch version** (e.g. 4.4.12, 5.1.9) comes out roughly every
1111
month. It only contains bug fixes, so you can safely upgrade your applications;
1212
* A new **Symfony minor version** (e.g. 4.4, 5.1) comes out every *six months*:
1313
one in *May* and one in *November*. It contains bug fixes and new features, but
@@ -53,7 +53,7 @@ Maintenance
5353

5454
Starting from the Symfony 3.x branch, the number of minor versions is limited to
5555
five per branch (X.0, X.1, X.2, X.3 and X.4). The last minor version of a branch
56-
(e.g. 3.4, 4.4, 5.4) is considered a **long-term support version** and the other
56+
(e.g. 4.4, 5.4) is considered a **long-term support version** and the other
5757
ones are considered **standard versions**:
5858

5959
======================= ===================== ================================
@@ -87,17 +87,17 @@ learn more about how deprecations are handled in Symfony.
8787
.. _major-version-development:
8888

8989
This deprecation policy also requires a custom development process for major
90-
versions (4.0, 5.0, 6.0, etc.) In those cases, Symfony develops at the same time
91-
two versions: the new major one (e.g. 4.0) and the latest version of the
92-
previous branch (e.g. 3.4).
90+
versions (5.0, 6.0, etc.) In those cases, Symfony develops at the same time
91+
two versions: the new major one (e.g. 5.0) and the latest version of the
92+
previous branch (e.g. 4.4).
9393

9494
Both versions have the same new features, but they differ in the deprecated
95-
features. The oldest version (3.4 in this example) contains all the deprecated
96-
features whereas the new version (4.0 in this example) removes all of them.
95+
features. The oldest version (4.4 in this example) contains all the deprecated
96+
features whereas the new version (5.0 in this example) removes all of them.
9797

98-
This allows you to upgrade your projects to the latest minor version (e.g. 3.4),
98+
This allows you to upgrade your projects to the latest minor version (e.g. 4.4),
9999
see all the deprecation messages and fix them. Once you have fixed all those
100-
deprecations, you can upgrade to the new major version (e.g. 4.0) without
100+
deprecations, you can upgrade to the new major version (e.g. 5.0) without
101101
effort, because it contains the same features (the only difference are the
102102
deprecated features, which your project no longer uses).
103103

contributing/documentation/overview.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,14 +112,14 @@ memorable name for the new branch (if you are fixing a reported issue, use
112112

113113
.. code-block:: terminal
114114
115-
$ git checkout -b improve_install_article upstream/3.4
115+
$ git checkout -b improve_install_article upstream/4.4
116116
117117
In this example, the name of the branch is ``improve_install_article`` and the
118-
``upstream/3.4`` value tells Git to create this branch based on the ``3.4``
118+
``upstream/4.4`` value tells Git to create this branch based on the ``4.4``
119119
branch of the ``upstream`` remote, which is the original Symfony Docs repository.
120120

121121
Fixes should always be based on the **oldest maintained branch** which contains
122-
the error. Nowadays this is the ``3.4`` branch. If you are instead documenting a
122+
the error. Nowadays this is the ``4.4`` branch. If you are instead documenting a
123123
new feature, switch to the first Symfony version that included it, e.g.
124124
``upstream/3.1``. Not sure? That's OK! Just use the ``upstream/master`` branch.
125125

@@ -155,7 +155,7 @@ changes should be applied:
155155
:align: center
156156

157157
In this example, the **base fork** should be ``symfony/symfony-docs`` and
158-
the **base** branch should be the ``3.4``, which is the branch that you selected
158+
the **base** branch should be the ``4.4``, which is the branch that you selected
159159
to base your changes on. The **head fork** should be your forked copy
160160
of ``symfony-docs`` and the **compare** branch should be ``improve_install_article``,
161161
which is the name of the branch you created and where you made your changes.
@@ -205,7 +205,7 @@ contribution to the Symfony docs:
205205
# create a new branch based on the oldest maintained version
206206
$ cd projects/symfony-docs/
207207
$ git fetch upstream
208-
$ git checkout -b my_changes upstream/3.4
208+
$ git checkout -b my_changes upstream/4.4
209209
210210
# ... do your changes
211211
@@ -303,8 +303,8 @@ into multiple branches, corresponding to the different versions of Symfony itsel
303303
The ``master`` branch holds the documentation for the development branch of
304304
the code.
305305

306-
Unless you're documenting a feature that was introduced after Symfony 3.4,
307-
your changes should always be based on the ``3.4`` branch. Documentation managers
306+
Unless you're documenting a feature that was introduced after Symfony 4.4,
307+
your changes should always be based on the ``4.4`` branch. Documentation managers
308308
will use the necessary Git-magic to also apply your changes to all the active
309309
branches of the documentation.
310310

0 commit comments

Comments
 (0)