Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 0017bf4

Browse filesBrowse files
wouterjwouterj
committed
Merge branch '2.4' into 2.5
Conflicts: changelog.rst
2 parents 9dd3a77 + f56e733 commit 0017bf4
Copy full SHA for 0017bf4

File tree

Expand file treeCollapse file tree

4 files changed

+29
-31
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

4 files changed

+29
-31
lines changed
Open diff view settings
Collapse file

‎components/dependency_injection/types.rst‎

Copy file name to clipboardExpand all lines: components/dependency_injection/types.rst
+2-2Lines changed: 2 additions & 2 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,8 @@ The disadvantages of setter injection are:
170170

171171
* The setter can be called more than just at the time of construction so
172172
you cannot be sure the dependency is not replaced during the lifetime of the
173-
object (except by explicitly writing the setter method to check if has already been
174-
called).
173+
object (except by explicitly writing the setter method to check if it has already
174+
been called).
175175

176176
* You cannot be sure the setter will be called and so you need to add checks
177177
that any required dependencies are injected.
Collapse file

‎contributing/community/releases.rst‎

Copy file name to clipboardExpand all lines: contributing/community/releases.rst
+14-23Lines changed: 14 additions & 23 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -86,29 +86,20 @@ 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 | 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-
+---------+---------+--------------------------+-------------+
89+
======= ============== ======= ======================== ===========
90+
Version Feature Freeze Release End of Maintenance End of Life
91+
======= ============== ======= ======================== ===========
92+
2.0 05/2011 07/2011 03/2013 (20 months) 09/2013
93+
2.1 07/2012 09/2012 05/2013 (9 months) 11/2013
94+
2.2 01/2013 03/2013 11/2013 (8 months) 05/2014
95+
**2.3** 03/2013 05/2013 05/2016 (36 months) 05/2017
96+
2.4 09/2013 11/2013 09/2014 (10 months [1]_) 01/2015
97+
2.5 02/2014 05/2014 01/2015 (8 months) 07/2015
98+
2.6 09/2014 11/2014 07/2015 (8 months) 01/2016
99+
**2.7** 02/2015 05/2015 05/2018 (36 months) 05/2019
100+
2.8 09/2015 11/2015 07/2016 (8 months) 01/2017
101+
... ... ... ... ...
102+
======= ============== ======= ======================== ===========
112103

113104
.. [1] Symfony 2.4 maintenance has been `extended to September 2014`_.
114105
Collapse file

‎cookbook/bundles/best_practices.rst‎

Copy file name to clipboardExpand all lines: cookbook/bundles/best_practices.rst
+12-5Lines changed: 12 additions & 5 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,20 @@ following standardized instructions in your ``README.md`` file.
230230
// app/AppKernel.php
231231
232232
// ...
233-
234-
public function registerBundles()
233+
class AppKernel extends Kernel
235234
{
236-
$bundles = array(
235+
public function registerBundles()
236+
{
237+
$bundles = array(
238+
// ...
239+
240+
new <vendor>\<bundle-name>\<bundle-long-name>(),
241+
);
242+
237243
// ...
238-
return new <vendor>\<bundle-name>\<bundle-long-name>(),
239-
);
244+
}
245+
246+
// ...
240247
}
241248
```
242249
Collapse file

‎reference/configuration/twig.rst‎

Copy file name to clipboardExpand all lines: reference/configuration/twig.rst
+1-1Lines changed: 1 addition & 1 deletion
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ TwigBundle Configuration ("twig")
5151
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5252
xmlns:twig="http://symfony.com/schema/dic/twig"
5353
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
54-
http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/doctrine/twig-1.0.xsd">
54+
http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
5555
5656
<twig:config auto-reload="%kernel.debug%" autoescape="true" base-template-class="Twig_Template" cache="%kernel.cache_dir%/twig" charset="%kernel.charset%" debug="%kernel.debug%" strict-variables="false">
5757
<twig:form>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.