From 82f8a795feed53afe8e0320845f548eb5b9cb324 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 3 Jan 2015 14:30:32 +0100 Subject: [PATCH 1/2] [TwigBundle] added missing @deprecated tags --- src/Symfony/Bundle/TwigBundle/Node/RenderNode.php | 2 ++ src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/Symfony/Bundle/TwigBundle/Node/RenderNode.php b/src/Symfony/Bundle/TwigBundle/Node/RenderNode.php index 7f4c385723..1c590f9ac8 100644 --- a/src/Symfony/Bundle/TwigBundle/Node/RenderNode.php +++ b/src/Symfony/Bundle/TwigBundle/Node/RenderNode.php @@ -15,6 +15,8 @@ namespace Symfony\Bundle\TwigBundle\Node; * Represents a render node. * * @author Fabien Potencier + * + * @deprecated since version 2.2, to be removed in 3.0. */ class RenderNode extends \Twig_Node { diff --git a/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php b/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php index fc53be4cbe..0d3ae2b86d 100644 --- a/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php +++ b/src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php @@ -17,6 +17,8 @@ use Symfony\Bundle\TwigBundle\Node\RenderNode; * Token Parser for the render tag. * * @author Fabien Potencier + * + * @deprecated since version 2.2, to be removed in 3.0. */ class RenderTokenParser extends \Twig_TokenParser { From ba51a0bf86471ab2043ddb7ceebbb229dd462c53 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Sat, 3 Jan 2015 19:20:28 +0100 Subject: [PATCH 2/2] [2.3] Fix lowest deps --- src/Symfony/Bundle/TwigBundle/composer.json | 2 +- src/Symfony/Component/Debug/composer.json | 2 +- src/Symfony/Component/HttpKernel/composer.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json index a10f0ba5f9..2922a91b3f 100644 --- a/src/Symfony/Bundle/TwigBundle/composer.json +++ b/src/Symfony/Bundle/TwigBundle/composer.json @@ -18,7 +18,7 @@ "require": { "php": ">=5.3.3", "symfony/twig-bridge": "~2.3,>=2.3.10", - "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", diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json index 4556180af4..4373012f95 100644 --- a/src/Symfony/Component/Debug/composer.json +++ b/src/Symfony/Component/Debug/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "require-dev": { - "symfony/http-kernel": "~2.3,>=2.3.24", + "symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2", "symfony/http-foundation": "~2.1" }, "suggest": { diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json index e4024efbed..a369869c14 100644 --- a/src/Symfony/Component/HttpKernel/composer.json +++ b/src/Symfony/Component/HttpKernel/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3", "symfony/event-dispatcher": "~2.1", "symfony/http-foundation": "~2.3,>=2.3.4", - "symfony/debug": "~2.3,>=2.3.24", + "symfony/debug": "~2.3.24|~2.5.9|~2.6,>=2.6.2", "psr/log": "~1.0" }, "require-dev": {