Skip to content

Commit 68e022a

Browse files
weaverryanweaverryan
committed
Merge branch '2.3' into 2.4
* 2.3: Added a note about the automatic handling of the memory spool in the CLI Added July changelog [Contributing] extended Symfony 2.4 maintenance field dependent empty_data option description add note on Symfony SE forks for bug reports Conflicts: changelog.rst reference/forms/types/number.rst
2 parents 2b9cb7c + 7806aa7 commit 68e022a

27 files changed

+207
-39
lines changed

‎contributing/code/bugs.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ If your problem definitely looks like a bug, report it using the official bug
2525
* Describe the steps needed to reproduce the bug with short code examples
2626
(providing a unit test that illustrates the bug is best);
2727

28+
* If the bug you experienced affects more than one layer, providing a simple
29+
failing unit test may not be sufficient. In this case, please fork the
30+
`Symfony Standard Edition`_ and reproduce your issue on a new branch;
31+
2832
* Give as much detail as possible about your environment (OS, PHP version,
2933
Symfony version, enabled extensions, ...);
3034

@@ -35,3 +39,4 @@ If your problem definitely looks like a bug, report it using the official bug
3539
.. _forum: http://forum.symfony-project.org/
3640
.. _IRC channel: irc://irc.freenode.net/symfony
3741
.. _tracker: https://github.com/symfony/symfony/issues
42+
.. _Symfony Standard Edition: https://github.com/symfony/symfony-standard/

‎contributing/community/releases.rst

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -86,29 +86,31 @@ Below is the schedule for the first few versions that use this release model:
8686

8787
This results in very predictable dates and maintenance periods:
8888

89-
+---------+---------+---------------------+-------------+
90-
| Version | Release | End of Maintenance | End of Life |
91-
+=========+=========+=====================+=============+
92-
| 2.0 | 07/2011 | 03/2013 (20 months) | 09/2013 |
93-
+---------+---------+---------------------+-------------+
94-
| 2.1 | 09/2012 | 05/2013 (9 months) | 11/2013 |
95-
+---------+---------+---------------------+-------------+
96-
| 2.2 | 03/2013 | 11/2013 (8 months) | 05/2014 |
97-
+---------+---------+---------------------+-------------+
98-
| **2.3** | 05/2013 | 05/2016 (36 months) | 05/2017 |
99-
+---------+---------+---------------------+-------------+
100-
| 2.4 | 11/2013 | 07/2014 (8 months) | 01/2015 |
101-
+---------+---------+---------------------+-------------+
102-
| 2.5 | 05/2014 | 01/2015 (8 months) | 07/2015 |
103-
+---------+---------+---------------------+-------------+
104-
| 2.6 | 11/2014 | 07/2015 (8 months) | 01/2016 |
105-
+---------+---------+---------------------+-------------+
106-
| **2.7** | 05/2015 | 05/2018 (36 months) | 05/2019 |
107-
+---------+---------+---------------------+-------------+
108-
| 2.8 | 11/2015 | 07/2016 (8 months) | 01/2017 |
109-
+---------+---------+---------------------+-------------+
110-
| ... | ... | ... | ... |
111-
+---------+---------+---------------------+-------------+
89+
+---------+---------+--------------------------+-------------+
90+
| Version | Release | End of Maintenance | End of Life |
91+
+=========+=========+==========================+=============+
92+
| 2.0 | 07/2011 | 03/2013 (20 months) | 09/2013 |
93+
+---------+---------+--------------------------+-------------+
94+
| 2.1 | 09/2012 | 05/2013 (9 months) | 11/2013 |
95+
+---------+---------+--------------------------+-------------+
96+
| 2.2 | 03/2013 | 11/2013 (8 months) | 05/2014 |
97+
+---------+---------+--------------------------+-------------+
98+
| **2.3** | 05/2013 | 05/2016 (36 months) | 05/2017 |
99+
+---------+---------+--------------------------+-------------+
100+
| 2.4 | 11/2013 | 09/2014 (10 months [1]_) | 01/2015 |
101+
+---------+---------+--------------------------+-------------+
102+
| 2.5 | 05/2014 | 01/2015 (8 months) | 07/2015 |
103+
+---------+---------+--------------------------+-------------+
104+
| 2.6 | 11/2014 | 07/2015 (8 months) | 01/2016 |
105+
+---------+---------+--------------------------+-------------+
106+
| **2.7** | 05/2015 | 05/2018 (36 months) | 05/2019 |
107+
+---------+---------+--------------------------+-------------+
108+
| 2.8 | 11/2015 | 07/2016 (8 months) | 01/2017 |
109+
+---------+---------+--------------------------+-------------+
110+
| ... | ... | ... | ... |
111+
+---------+---------+--------------------------+-------------+
112+
113+
.. [1] Symfony 2.4 maintenance has been `extended to September 2014`_.
112114
113115
.. tip::
114116

@@ -179,4 +181,5 @@ version is published every two years and there is a year to upgrade.
179181
.. _Git repository: https://github.com/symfony/symfony
180182
.. _SensioLabs: http://sensiolabs.com/
181183
.. _roadmap notification: http://symfony.com/roadmap
184+
.. _extended to September 2014: http://symfony.com/blog/extended-maintenance-for-symfony-2-4
182185
.. _timeline calculator: http://symfony.com/roadmap

‎cookbook/console/sending_emails.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ from the ``router`` service and override its settings::
8888
Using Memory Spooling
8989
---------------------
9090

91+
.. versionadded: 2.3
92+
When using Symfony 2.3+ and SwiftmailerBundle 2.3.5+, the memory spool is now
93+
handled automatically in the CLI and the code below is not necessary anymore.
94+
9195
Sending emails in a console command works the same way as described in the
9296
:doc:`/cookbook/email/email` cookbook except if memory spooling is used.
9397

‎images/release-process.jpg

14.9 KB
Loading

‎reference/forms/types/choice.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@ Overridden Options
115115
------------------
116116

117117
.. include:: /reference/forms/types/options/empty_data.rst.inc
118+
:end-before: DEFAULT_PLACEHOLDER
119+
120+
The actual default value of this option depends on other field options:
121+
122+
* If ``multiple`` is ``false`` and ``expanded`` is ``false``, then ``''``
123+
(empty string);
124+
* Otherwise ``array()`` (empty array).
125+
126+
.. include:: /reference/forms/types/options/empty_data.rst.inc
127+
:start-after: DEFAULT_PLACEHOLDER
118128

119129
compound
120130
~~~~~~~~

‎reference/forms/types/collection.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,12 @@ error_bubbling
360360
.. include:: /reference/forms/types/options/by_reference.rst.inc
361361

362362
.. include:: /reference/forms/types/options/empty_data.rst.inc
363+
:end-before: DEFAULT_PLACEHOLDER
364+
365+
The default value is ``array()`` (empty array).
366+
367+
.. include:: /reference/forms/types/options/empty_data.rst.inc
368+
:start-after: DEFAULT_PLACEHOLDER
363369

364370
.. include:: /reference/forms/types/options/required.rst.inc
365371

‎reference/forms/types/country.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,16 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
7676
These options inherit from the :doc:`form </reference/forms/types/form>` type:
7777

7878
.. include:: /reference/forms/types/options/empty_data.rst.inc
79+
:end-before: DEFAULT_PLACEHOLDER
80+
81+
The actual default value of this option depends on other field options:
82+
83+
* If ``multiple`` is ``false`` and ``expanded`` is ``false``, then ``''``
84+
(empty string);
85+
* Otherwise ``array()`` (empty array).
86+
87+
.. include:: /reference/forms/types/options/empty_data.rst.inc
88+
:start-after: DEFAULT_PLACEHOLDER
7989

8090
.. include:: /reference/forms/types/options/required.rst.inc
8191

‎reference/forms/types/currency.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,16 @@ These options inherit from the :doc:`choice</reference/forms/types/choice>` type
6666
These options inherit from the :doc:`form</reference/forms/types/form>` type:
6767

6868
.. include:: /reference/forms/types/options/empty_data.rst.inc
69+
:end-before: DEFAULT_PLACEHOLDER
70+
71+
The actual default value of this option depends on other field options:
72+
73+
* If ``multiple`` is ``false`` and ``expanded`` is ``false``, then ``''``
74+
(empty string);
75+
* Otherwise ``array()`` (empty array).
76+
77+
.. include:: /reference/forms/types/options/empty_data.rst.inc
78+
:start-after: DEFAULT_PLACEHOLDER
6979

7080
.. include:: /reference/forms/types/options/required.rst.inc
7181

‎reference/forms/types/email.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ These options inherit from the :doc:`form </reference/forms/types/form>` type:
3636
.. include:: /reference/forms/types/options/max_length.rst.inc
3737

3838
.. include:: /reference/forms/types/options/empty_data.rst.inc
39+
:end-before: DEFAULT_PLACEHOLDER
40+
41+
The default value is ``''`` (the empty string).
42+
43+
.. include:: /reference/forms/types/options/empty_data.rst.inc
44+
:start-after: DEFAULT_PLACEHOLDER
3945

4046
.. include:: /reference/forms/types/options/required.rst.inc
4147

‎reference/forms/types/entity.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,16 @@ These options inherit from the :doc:`choice </reference/forms/types/choice>` typ
212212
These options inherit from the :doc:`form </reference/forms/types/form>` type:
213213

214214
.. include:: /reference/forms/types/options/empty_data.rst.inc
215+
:end-before: DEFAULT_PLACEHOLDER
216+
217+
The actual default value of this option depends on other field options:
218+
219+
* If ``multiple`` is ``false`` and ``expanded`` is ``false``, then ``''``
220+
(empty string);
221+
* Otherwise ``array()`` (empty array).
222+
223+
.. include:: /reference/forms/types/options/empty_data.rst.inc
224+
:start-after: DEFAULT_PLACEHOLDER
215225

216226
.. include:: /reference/forms/types/options/required.rst.inc
217227

0 commit comments

Comments
 (0)