Skip to content

Commit 818849d

Browse files
Merge branch '2.6' into 2.7
* 2.6: [2.3] Fix lowest deps [TwigBundle] added missing @deprecated tags Conflicts: src/Symfony/Bundle/TwigBundle/composer.json
2 parents 184f5af + adf8c72 commit 818849d

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

Node/RenderNode.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* Represents a render node.
1616
*
1717
* @author Fabien Potencier <[email protected]>
18+
*
19+
* @deprecated since version 2.2, to be removed in 3.0.
1820
*/
1921
class RenderNode extends \Twig_Node
2022
{

TokenParser/RenderTokenParser.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
* Token Parser for the render tag.
1818
*
1919
* @author Fabien Potencier <[email protected]>
20+
*
21+
* @deprecated since version 2.2, to be removed in 3.0.
2022
*/
2123
class RenderTokenParser extends \Twig_TokenParser
2224
{

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": ">=5.3.3",
2020
"symfony/twig-bridge": "~2.6|~3.0.0",
2121
"symfony/http-foundation": "~2.5|~3.0.0",
22-
"symfony/http-kernel": "~2.3,>=2.3.24|~3.0.0"
22+
"symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0"
2323
},
2424
"require-dev": {
2525
"symfony/stopwatch": "~2.2|~3.0.0",

0 commit comments

Comments
 (0)