Merge branch '2.3' into 2.5

nicolas-grekas · nicolas-grekas · commit dd3b41d4a4e3 · 2015-01-03T19:22:52.000+01:00
* 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
diff --git a/Node/RenderNode.php b/Node/RenderNode.php
@@ -15,6 +15,8 @@
  * 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
 {
diff --git a/TokenParser/RenderTokenParser.php b/TokenParser/RenderTokenParser.php
@@ -17,6 +17,8 @@
  * 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
 {
diff --git a/composer.json b/composer.json
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`* Represents a render node.`
`16`	`16`	`*`
`17`	`17`	`* @author Fabien Potencier <[email protected]>`
	`18`	`+ *`
	`19`	`+ * @deprecated since version 2.2, to be removed in 3.0.`
`18`	`20`	`*/`
`19`	`21`	`class RenderNode extends \Twig_Node`
`20`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`* Token Parser for the render tag.`
`18`	`18`	`*`
`19`	`19`	`* @author Fabien Potencier <[email protected]>`
	`20`	`+ *`
	`21`	`+ * @deprecated since version 2.2, to be removed in 3.0.`
`20`	`22`	`*/`
`21`	`23`	`class RenderTokenParser extends \Twig_TokenParser`
`22`	`24`	`{`