Merge branch '2.3' into 2.5

* 2.3:
  [2.3] Fix lowest deps
  [TwigBundle] added missing @deprecated tags

Conflicts:
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/HttpKernel/composer.json
This commit is contained in:
Nicolas Grekas 2015-01-03 19:22:52 +01:00
commit 627ef4c2fd
3 changed files with 5 additions and 1 deletions

View File

@ -15,6 +15,8 @@ namespace Symfony\Bundle\TwigBundle\Node;
* Represents a render node.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @deprecated since version 2.2, to be removed in 3.0.
*/
class RenderNode extends \Twig_Node
{

View File

@ -17,6 +17,8 @@ use Symfony\Bundle\TwigBundle\Node\RenderNode;
* Token Parser for the render tag.
*
* @author Fabien Potencier <fabien@symfony.com>
*
* @deprecated since version 2.2, to be removed in 3.0.
*/
class RenderTokenParser extends \Twig_TokenParser
{

View File

@ -19,7 +19,7 @@
"php": ">=5.3.3",
"symfony/twig-bridge": "~2.5",
"symfony/http-foundation": "~2.5",
"symfony/http-kernel": "~2.3,>=2.3.24"
"symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2"
},
"require-dev": {
"symfony/stopwatch": "~2.2",