Skip to content

Commit b4c5ce2

Browse files
committed
bugfixes should be placed for the 2.8 branch
1 parent fb039a7 commit b4c5ce2

File tree

3 files changed

+14
-22
lines changed

3 files changed

+14
-22
lines changed

README.markdown

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Contributing
77
------------
88

99
>**Note**
10-
>Unless you're documenting a feature that was introduced *after* Symfony 2.7
11-
>(e.g. in Symfony 2.8), all pull requests must be based off of the **2.7** branch,
10+
>Unless you're documenting a feature that was introduced *after* Symfony 2.8
11+
>(e.g. in Symfony 3.4), all pull requests must be based off of the **2.8** branch,
1212
>**not** the master or older branches.
1313
1414
We love contributors! For more information on how you can contribute to the

contributing/code/patches.rst

+11-17
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ software:
1616
* Git;
1717
* PHP version 5.3.9 or above.
1818

19-
.. caution::
20-
21-
Before Symfony 2.7, the minimal PHP version was 5.3.3. Please keep
22-
this in mind, if you are working on a bug fix for earlier versions
23-
of Symfony.
24-
2519
Configure Git
2620
~~~~~~~~~~~~~
2721

@@ -112,7 +106,7 @@ Choose the right Branch
112106
Before working on a patch, you must determine on which branch you need to
113107
work:
114108

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

124118
All bug fixes merged into maintenance branches are also merged into more
125119
recent branches on a regular basis. For instance, if you submit a patch
126-
for the ``2.7`` branch, the patch will also be applied by the core team on
120+
for the ``2.8`` branch, the patch will also be applied by the core team on
127121
the ``master`` branch.
128122

129123
Create a Topic Branch
@@ -136,18 +130,18 @@ topic branch:
136130
137131
$ git checkout -b BRANCH_NAME master
138132
139-
Or, if you want to provide a bugfix for the ``2.7`` branch, first track the remote
140-
``2.7`` branch locally:
133+
Or, if you want to provide a bugfix for the ``2.8`` branch, first track the remote
134+
``2.8`` branch locally:
141135

142136
.. code-block:: terminal
143137
144-
$ git checkout -t origin/2.7
138+
$ git checkout -t origin/2.8
145139
146-
Then create a new branch off the ``2.7`` branch to work on the bugfix:
140+
Then create a new branch off the ``2.8`` branch to work on the bugfix:
147141

148142
.. code-block:: terminal
149143
150-
$ git checkout -b BRANCH_NAME 2.7
144+
$ git checkout -b BRANCH_NAME 2.8
151145
152146
.. tip::
153147

@@ -251,7 +245,7 @@ while to finish your changes):
251245
252246
.. tip::
253247

254-
Replace ``master`` with the branch you selected previously (e.g. ``2.7``)
248+
Replace ``master`` with the branch you selected previously (e.g. ``2.8``)
255249
if you are working on a bugfix
256250

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

279273
.. tip::
280274

281-
Take care to point your pull request towards ``symfony:2.7`` if you want
282-
the core team to pull a bugfix based on the ``2.7`` branch.
275+
Take care to point your pull request towards ``symfony:2.8`` if you want
276+
the core team to pull a bugfix based on the ``2.8`` branch.
283277

284278
To ease the core team work, always include the modified components in your
285279
pull request message, like in:
@@ -350,7 +344,7 @@ Rework your Patch
350344

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

355349
.. code-block:: terminal
356350

reference/forms/types/choice.rst

+1-3
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,7 @@ choice_loader
240240
~~~~~~~~~~~~~
241241

242242
.. versionadded:: 2.7
243-
244-
The ``choice_loader`` option was added in Symfony 2.7.
243+
The ``choice_loader`` option was introduced in Symfony 2.7.
245244

246245
**type**: :class:`Symfony\\Component\\Form\\ChoiceList\\Loader\\ChoiceLoaderInterface`
247246

@@ -261,7 +260,6 @@ choices_as_values
261260
**type**: ``boolean`` **default**: false
262261

263262
.. versionadded:: 2.7
264-
265263
The ``choices_as_values`` option was introduced in Symfony 2.7.
266264

267265
The ``choices_as_values`` option was added to keep backward compatibility with the

0 commit comments

Comments
 (0)