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
This commit is contained in:
commit
9f588e6a56
@ -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
|
||||
{
|
||||
|
@ -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
|
||||
{
|
||||
|
@ -19,7 +19,7 @@
|
||||
"php": ">=5.3.3",
|
||||
"symfony/twig-bridge": "~2.6|~3.0.0",
|
||||
"symfony/http-foundation": "~2.5|~3.0.0",
|
||||
"symfony/http-kernel": "~2.3,>=2.3.24|~3.0.0"
|
||||
"symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2|~3.0.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"symfony/stopwatch": "~2.2|~3.0.0",
|
||||
|
Reference in New Issue
Block a user