Skip to content

Change "2.3" to "2.7" as Symfony 2.3 has reached End of Maintenance #6630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Change "2.3" to "2.7" as Symfony 2.3 has reached End of Maintenance #6630

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions contributing/code/patches.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@ Choose the right Branch
Before working on a patch, you must determine on which branch you need to
work:

* ``2.3``, if you are fixing a bug for an existing feature or want to make a
* ``2.3``, for security issues;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

technically, you should not be working on security issues in the open. Work on security issues happens through a different process than the one described in this documentation page (due to being handled privately)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, let's remove this about security fixes. We already have some warnings explaining how to deal with security issues.


* ``2.7``, if you are fixing a bug for an existing feature or want to make a
change that falls into the :doc:`list of acceptable changes in patch versions
</contributing/code/maintenance>` (you may have to choose a higher branch if
the feature you are fixing was introduced in a later version);
Expand All @@ -124,7 +126,7 @@ work:

All bug fixes merged into maintenance branches are also merged into more
recent branches on a regular basis. For instance, if you submit a patch
for the ``2.3`` branch, the patch will also be applied by the core team on
for the ``2.7`` branch, the patch will also be applied by the core team on
the ``master`` branch.

Create a Topic Branch
Expand All @@ -137,18 +139,18 @@ topic branch:

$ git checkout -b BRANCH_NAME master

Or, if you want to provide a bugfix for the ``2.3`` branch, first track the remote
``2.3`` branch locally:
Or, if you want to provide a bugfix for the ``2.7`` branch, first track the remote
``2.7`` branch locally:

.. code-block:: bash

$ git checkout -t origin/2.3
$ git checkout -t origin/2.7

Then create a new branch off the ``2.3`` branch to work on the bugfix:
Then create a new branch off the ``2.7`` branch to work on the bugfix:

.. code-block:: bash

$ git checkout -b BRANCH_NAME 2.3
$ git checkout -b BRANCH_NAME 2.7

.. tip::

Expand Down Expand Up @@ -236,7 +238,7 @@ while to finish your changes):

.. tip::

Replace ``master`` with the branch you selected previously (e.g. ``2.3``)
Replace ``master`` with the branch you selected previously (e.g. ``2.7``)
if you are working on a bugfix

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

.. tip::

Take care to point your pull request towards ``symfony:2.3`` if you want
the core team to pull a bugfix based on the ``2.3`` branch.
Take care to point your pull request towards ``symfony:2.7`` if you want
the core team to pull a bugfix based on the ``2.7`` branch.

To ease the core team work, always include the modified components in your
pull request message, like in:
Expand Down Expand Up @@ -335,7 +337,7 @@ Rework your Patch

Based on the feedback on the pull request, you might need to rework your
patch. Before re-submitting the patch, rebase with ``upstream/master`` or
``upstream/2.3``, don't merge; and force the push to the origin:
``upstream/2.7``, don't merge; and force the push to the origin:

.. code-block:: bash

Expand Down