From d157a14b37aab2168f9e4c6a64862ad2ba79f046 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 23 Sep 2014 13:23:31 +0200 Subject: [PATCH 1/6] Added feature freeze dates for Symfony versions --- contributing/community/releases.rst | 37 +++++++++++------------------ 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/contributing/community/releases.rst b/contributing/community/releases.rst index 6c953c83f85..e234c5cfef2 100644 --- a/contributing/community/releases.rst +++ b/contributing/community/releases.rst @@ -86,29 +86,20 @@ Below is the schedule for the first few versions that use this release model: This results in very predictable dates and maintenance periods: -+---------+---------+--------------------------+-------------+ -| Version | Release | End of Maintenance | End of Life | -+=========+=========+==========================+=============+ -| 2.0 | 07/2011 | 03/2013 (20 months) | 09/2013 | -+---------+---------+--------------------------+-------------+ -| 2.1 | 09/2012 | 05/2013 (9 months) | 11/2013 | -+---------+---------+--------------------------+-------------+ -| 2.2 | 03/2013 | 11/2013 (8 months) | 05/2014 | -+---------+---------+--------------------------+-------------+ -| **2.3** | 05/2013 | 05/2016 (36 months) | 05/2017 | -+---------+---------+--------------------------+-------------+ -| 2.4 | 11/2013 | 09/2014 (10 months [1]_) | 01/2015 | -+---------+---------+--------------------------+-------------+ -| 2.5 | 05/2014 | 01/2015 (8 months) | 07/2015 | -+---------+---------+--------------------------+-------------+ -| 2.6 | 11/2014 | 07/2015 (8 months) | 01/2016 | -+---------+---------+--------------------------+-------------+ -| **2.7** | 05/2015 | 05/2018 (36 months) | 05/2019 | -+---------+---------+--------------------------+-------------+ -| 2.8 | 11/2015 | 07/2016 (8 months) | 01/2017 | -+---------+---------+--------------------------+-------------+ -| ... | ... | ... | ... | -+---------+---------+--------------------------+-------------+ +======= ============== ======= ======================== =========== +Version Feature Freeze Release End of Maintenance End of Life +======= ============== ======= ======================== =========== +2.0 05/2011 07/2011 03/2013 (20 months) 09/2013 +2.1 07/2012 09/2012 05/2013 (9 months) 11/2013 +2.2 01/2013 03/2013 11/2013 (8 months) 05/2014 +**2.3** 03/2013 05/2013 05/2016 (36 months) 05/2017 +2.4 09/2013 11/2013 09/2014 (10 months [1]_) 01/2015 +2.5 02/2014 05/2014 01/2015 (8 months) 07/2015 +2.6 09/2014 11/2014 07/2015 (8 months) 01/2016 +**2.7** 02/2015 05/2015 05/2018 (36 months) 05/2019 +2.8 09/2015 11/2015 07/2016 (8 months) 01/2017 +... ... ... ... ... +======= ============== ======= ======================== =========== .. [1] Symfony 2.4 maintenance has been `extended to September 2014`_. From 23fdef3935192ac1b4d38a1abd9fa6f879f97ac7 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 23 Sep 2014 22:40:35 +0200 Subject: [PATCH 2/6] Fixed typo --- reference/configuration/twig.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst index cdb3de3bd00..4c72abb03c1 100644 --- a/reference/configuration/twig.rst +++ b/reference/configuration/twig.rst @@ -51,7 +51,7 @@ TwigBundle Configuration ("twig") xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:twig="http://symfony.com/schema/dic/twig" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd - http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/doctrine/twig-1.0.xsd"> + http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd"> From bd7da6743d4854346d3e67b7cfc19908c2b71936 Mon Sep 17 00:00:00 2001 From: Wouter J Date: Thu, 25 Sep 2014 10:40:09 +0200 Subject: [PATCH 3/6] Fix error in code --- cookbook/bundles/best_practices.rst | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/cookbook/bundles/best_practices.rst b/cookbook/bundles/best_practices.rst index 51465b9d15a..d9c5fa88801 100644 --- a/cookbook/bundles/best_practices.rst +++ b/cookbook/bundles/best_practices.rst @@ -230,13 +230,20 @@ following standardized instructions in your ``README.md`` file. // app/AppKernel.php // ... - - public function registerBundles() + class AppKernel extends Kernel { - $bundles = array( + public function registerBundles() + { + $bundles = array( + // ... + + new \\(), + ); + // ... - return new \\(), - ); + } + + // ... } ``` From 8e20dfb3eb728fa12a88f61476ab432bb03e4fdd Mon Sep 17 00:00:00 2001 From: WouterJ Date: Sun, 28 Sep 2014 14:25:18 +0200 Subject: [PATCH 4/6] Created August CHANGELOG --- changelog.rst | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/changelog.rst b/changelog.rst index 9e09dd270bf..7e562ed1e86 100644 --- a/changelog.rst +++ b/changelog.rst @@ -13,6 +13,78 @@ documentation. Do you also want to participate in the Symfony Documentation? Take a look at the ":doc:`/contributing/documentation/overview`" article. +August, 2014 +------------ + +New Documentation +~~~~~~~~~~~~~~~~~ + +- `bccb080 `_ #4140 [Cookbook][Logging] document multiple recipients in XML configs (xabbuh) +- `7a6e3d1 `_ #4150 Added the schema_filter option to the reference (peterrehm) +- `be90d8a `_ #4142 [Cookbook][Configuration] tweaks for the web server configuration chapter (xabbuh) +- `041105c `_ #3883 Removed redundant POST request exclusion info (ryancastle) +- `4f9fef6 `_ #4000 [Cookbook] add cookbook article for the server:run command (xabbuh) +- `4ea4dfe `_ #3915 [Cookbook][Configuration] documentation of Apache + PHP-FPM (xabbuh) +- `4d5adaa `_ #4125 Added link to JSFiddle example (WouterJ) +- `75bda4b `_ #4124 Rebased #3965 (WouterJ) +- `fdb8a32 `_ #3950 [Components][EventDispatcher] describe the usage of the RegisterListenersPass (xabbuh) +- `7e09383 `_ #3940 Updated docs for Monolog "swift" handler in cookbook. (phansys) +- `8adfe98 `_ #3894 Rewrote Extension & Configuration docs (WouterJ) +- `cafea43 `_ #3888 Updated the example used to explain page creation (javiereguiluz) +- `df0cf68 `_ #3885 [RFR] Added "How to Organize Configuration Files" cookbook (javiereguiluz) +- `41116da `_ #4081 [Components][ClassLoader] documentation for the ClassMapGenerator class (xabbuh) +- `35a0f66 `_ #4102 Adding a new entry about reverse proxies in the framework (weaverryan) +- `95c2066 `_ #4096 labels in submit buttons + new screenshot (ricardclau) + +Fixed Documentation +~~~~~~~~~~~~~~~~~~~ + +- `4882b99 `_ #4164 Fixed minor typos. (ahsio) +- `eaaa35a `_ #4145 Fix documentation for group_sequence_provider (giosh94mhz) +- `2c93aa5 `_ #4147 [Cookbook][Logging] add missing Monolog handler type in XML config (xabbuh) +- `53b2c2b `_ #4139 cleaned up the code example (gondo) +- `b5c9f2a `_ #4138 fixed wrongly linked dependency (gondo) +- `b486b22 `_ #4131 Replaced old way of specifying http method by the new one (Baptouuuu) +- `93481d7 `_ #4120 Fix use mistakes (mbutkereit) +- `c0a0120 `_ #4119 Fix class name in ConsoleTerminateListener example (alOneh) +- `d699255 `_ #4083 [Reference] field dependent empty_data option description (xabbuh) +- `3ffc20f `_ #4103 [Cookbook][Forms] fix PHP template file name (xabbuh) +- `234fa36 `_ #4095 Fix php template (piotrantosik) +- `01fb9f2 `_ #4093 See #4091 (dannykopping) +- `7d39b03 `_ #4079 Fixed typo in filesystem component (kohkimakimoto) +- `f0bde03 `_ #4075 Fixed typo in the yml validation (timothymctim) + +Minor Documentation Changes +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- `e9d317a `_ #4160 [Reference] consistent & complete config examples (xabbuh) +- `3e68ee7 `_ #4152 Adding 'attr' option to the Textarea options list (ronanguilloux) +- `c4eb628 `_ #4130 A set of small typos (Baptouuuu) +- `236d8e0 `_ #4137 fixed directive syntax (WouterJ) +- `6e90520 `_ #4135 [#3940] Adding php example for an array of emails (weaverryan) +- `b37ee61 `_ #4132 Use proper way to reference a doc page for legacy sessions (Baptouuuu) +- `189a123 `_ #4129 [Components] consistent & complete config examples (xabbuh) +- `46f3108 `_ #4126 Rebased #3848 (WouterJ) +- `84e6e7f `_ #4114 [Book] consistent and complete config examples (xabbuh) +- `03fcab1 `_ #4112 [Contributing][Documentation] add order of translation formats (xabbuh) +- `650120a `_ #4002 added Github teams for the core team (fabpot) +- `10792c3 `_ #3959 [book][cache][tip] added cache annotations. (aitboudad) +- `ebaed21 `_ #3944 Update dbal.rst (bpiepiora) +- `16e346a `_ #3890 [Components][HttpFoundation] use a placeholder for the constructor arguments (xabbuh) +- `7bb4f34 `_ #4115 [Documentation] [Minor] Changes foobar.net in example.com (magnetik) +- `12d0b82 `_ #4113 tweaks to the new reverse proxy/load balancer chapter (xabbuh) +- `4cce133 `_ #4057 Update introduction.rst (carltondickson) +- `26141d6 `_ #4080 [Reference] order form type options alphabetically (xabbuh) +- `7806aa7 `_ #4117 Added a note about the automatic handling of the memory spool in the CLI (stof) +- `5959b6c `_ #4101 [Contributing] extended Symfony 2.4 maintenance (xabbuh) +- `e2056ad `_ #4072 [Contributing][Code] add note on Symfony SE forks for bug reports (xabbuh) +- `665c091 `_ #4087 Typo (tvlooy) +- `f95bbf3 `_ #4023 [Cookbook][Security] usage of a non-default entity manager in an entity user provider (xabbuh) +- `27b1003 `_ #4074 Fixed (again) a typo: Toolbet --> Toolbelt (javiereguiluz) +- `c97418f `_ #4073 Reworded bundle requirement (WouterJ) +- `e5d5eb8 `_ #4066 Update inherit_data_option.rst (Oylex) +- `9c08572 `_ #4064 Fixed typo on tag service (saro0h) + July, 2014 ---------- From f641e69bc34c9b6bac85165f15346d016774cd1c Mon Sep 17 00:00:00 2001 From: WouterJ Date: Sun, 28 Sep 2014 14:25:45 +0200 Subject: [PATCH 5/6] Created August CHANGELOG --- changelog.rst | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/changelog.rst b/changelog.rst index 04cc5e66038..1ff28341e50 100644 --- a/changelog.rst +++ b/changelog.rst @@ -13,6 +13,84 @@ documentation. Do you also want to participate in the Symfony Documentation? Take a look at the ":doc:`/contributing/documentation/overview`" article. +August, 2014 +------------ + +New Documentation +~~~~~~~~~~~~~~~~~ + +- `bccb080 `_ #4140 [Cookbook][Logging] document multiple recipients in XML configs (xabbuh) +- `7a6e3d1 `_ #4150 Added the schema_filter option to the reference (peterrehm) +- `be90d8a `_ #4142 [Cookbook][Configuration] tweaks for the web server configuration chapter (xabbuh) +- `5379f54 `_ #4086 [Reference][Constraints] Added hint about attaching the expression constraint to a form field (peterrehm) +- `041105c `_ #3883 Removed redundant POST request exclusion info (ryancastle) +- `4f9fef6 `_ #4000 [Cookbook] add cookbook article for the server:run command (xabbuh) +- `4ea4dfe `_ #3915 [Cookbook][Configuration] documentation of Apache + PHP-FPM (xabbuh) +- `08bed5f `_ #4128 Finished #3759 (WouterJ) +- `4d5adaa `_ #4125 Added link to JSFiddle example (WouterJ) +- `75bda4b `_ #4124 Rebased #3965 (WouterJ) +- `fdb8a32 `_ #3950 [Components][EventDispatcher] describe the usage of the RegisterListenersPass (xabbuh) +- `7e09383 `_ #3940 Updated docs for Monolog "swift" handler in cookbook. (phansys) +- `8adfe98 `_ #3894 Rewrote Extension & Configuration docs (WouterJ) +- `cafea43 `_ #3888 Updated the example used to explain page creation (javiereguiluz) +- `df0cf68 `_ #3885 [RFR] Added "How to Organize Configuration Files" cookbook (javiereguiluz) +- `41116da `_ #4081 [Components][ClassLoader] documentation for the ClassMapGenerator class (xabbuh) +- `2b9cb7c `_ #4076 Fixed description of session storage of the ApiKeyAuthenticator (peterrehm) +- `35a0f66 `_ #4102 Adding a new entry about reverse proxies in the framework (weaverryan) +- `95c2066 `_ #4096 labels in submit buttons + new screenshot (ricardclau) + +Fixed Documentation +~~~~~~~~~~~~~~~~~~~ + +- `5fac303 `_ #4165 Update voters.rst (gerryvdm) +- `4882b99 `_ #4164 Fixed minor typos. (ahsio) +- `eaaa35a `_ #4145 Fix documentation for group_sequence_provider (giosh94mhz) +- `155c3e8 `_ #4153 [Reference] fix namespace in Expression constraint (xabbuh) +- `2c93aa5 `_ #4147 [Cookbook][Logging] add missing Monolog handler type in XML config (xabbuh) +- `53b2c2b `_ #4139 cleaned up the code example (gondo) +- `b5c9f2a `_ #4138 fixed wrongly linked dependency (gondo) +- `b486b22 `_ #4131 Replaced old way of specifying http method by the new one (Baptouuuu) +- `93481d7 `_ #4120 Fix use mistakes (mbutkereit) +- `c0a0120 `_ #4119 Fix class name in ConsoleTerminateListener example (alOneh) +- `4629d8b `_ #4116 Fixed the code snippets for the expression language functions (stof) +- `d699255 `_ #4083 [Reference] field dependent empty_data option description (xabbuh) +- `3ffc20f `_ #4103 [Cookbook][Forms] fix PHP template file name (xabbuh) +- `234fa36 `_ #4095 Fix php template (piotrantosik) +- `01fb9f2 `_ #4093 See #4091 (dannykopping) +- `7d39b03 `_ #4079 Fixed typo in filesystem component (kohkimakimoto) +- `f0bde03 `_ #4075 Fixed typo in the yml validation (timothymctim) + +Minor Documentation Changes +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- `e9d317a `_ #4160 [Reference] consistent & complete config examples (xabbuh) +- `3e68ee7 `_ #4152 Adding 'attr' option to the Textarea options list (ronanguilloux) +- `c4eb628 `_ #4130 A set of small typos (Baptouuuu) +- `236d8e0 `_ #4137 fixed directive syntax (WouterJ) +- `6e90520 `_ #4135 [#3940] Adding php example for an array of emails (weaverryan) +- `b37ee61 `_ #4132 Use proper way to reference a doc page for legacy sessions (Baptouuuu) +- `189a123 `_ #4129 [Components] consistent & complete config examples (xabbuh) +- `46f3108 `_ #4126 Rebased #3848 (WouterJ) +- `84e6e7f `_ #4114 [Book] consistent and complete config examples (xabbuh) +- `03fcab1 `_ #4112 [Contributing][Documentation] add order of translation formats (xabbuh) +- `650120a `_ #4002 added Github teams for the core team (fabpot) +- `10792c3 `_ #3959 [book][cache][tip] added cache annotations. (aitboudad) +- `ebaed21 `_ #3944 Update dbal.rst (bpiepiora) +- `16e346a `_ #3890 [Components][HttpFoundation] use a placeholder for the constructor arguments (xabbuh) +- `7bb4f34 `_ #4115 [Documentation] [Minor] Changes foobar.net in example.com (magnetik) +- `12d0b82 `_ #4113 tweaks to the new reverse proxy/load balancer chapter (xabbuh) +- `4cce133 `_ #4057 Update introduction.rst (carltondickson) +- `26141d6 `_ #4080 [Reference] order form type options alphabetically (xabbuh) +- `7806aa7 `_ #4117 Added a note about the automatic handling of the memory spool in the CLI (stof) +- `5959b6c `_ #4101 [Contributing] extended Symfony 2.4 maintenance (xabbuh) +- `e2056ad `_ #4072 [Contributing][Code] add note on Symfony SE forks for bug reports (xabbuh) +- `665c091 `_ #4087 Typo (tvlooy) +- `f95bbf3 `_ #4023 [Cookbook][Security] usage of a non-default entity manager in an entity user provider (xabbuh) +- `27b1003 `_ #4074 Fixed (again) a typo: Toolbet --> Toolbelt (javiereguiluz) +- `c97418f `_ #4073 Reworded bundle requirement (WouterJ) +- `e5d5eb8 `_ #4066 Update inherit_data_option.rst (Oylex) +- `9c08572 `_ #4064 Fixed typo on tag service (saro0h) + July, 2014 ---------- From 2377280c82eefe9e92f40bd95c5a4eb00750c3a5 Mon Sep 17 00:00:00 2001 From: Fabien Schurter Date: Sun, 28 Sep 2014 19:18:27 +0200 Subject: [PATCH 6/6] Insert a missing word MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This phrase part was missing the «it» word as a subject. New lines were reorganized a bit in order to respect the 80 character wrap length. --- components/dependency_injection/types.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/dependency_injection/types.rst b/components/dependency_injection/types.rst index 3fb9181fdea..0a1f65304b8 100644 --- a/components/dependency_injection/types.rst +++ b/components/dependency_injection/types.rst @@ -170,8 +170,8 @@ The disadvantages of setter injection are: * The setter can be called more than just at the time of construction so you cannot be sure the dependency is not replaced during the lifetime of the - object (except by explicitly writing the setter method to check if has already been - called). + object (except by explicitly writing the setter method to check if it has already + been called). * You cannot be sure the setter will be called and so you need to add checks that any required dependencies are injected.