Merge branch '2.5' into 2.6
* 2.5: [2.3] Fix lowest deps [TwigBundle] added missing @deprecated tags
This commit is contained in:
commit
45547519ae
@ -15,6 +15,8 @@ namespace Symfony\Bundle\TwigBundle\Node;
|
|||||||
* Represents a render node.
|
* Represents a render node.
|
||||||
*
|
*
|
||||||
* @author Fabien Potencier <fabien@symfony.com>
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* @deprecated since version 2.2, to be removed in 3.0.
|
||||||
*/
|
*/
|
||||||
class RenderNode extends \Twig_Node
|
class RenderNode extends \Twig_Node
|
||||||
{
|
{
|
||||||
|
@ -17,6 +17,8 @@ use Symfony\Bundle\TwigBundle\Node\RenderNode;
|
|||||||
* Token Parser for the render tag.
|
* Token Parser for the render tag.
|
||||||
*
|
*
|
||||||
* @author Fabien Potencier <fabien@symfony.com>
|
* @author Fabien Potencier <fabien@symfony.com>
|
||||||
|
*
|
||||||
|
* @deprecated since version 2.2, to be removed in 3.0.
|
||||||
*/
|
*/
|
||||||
class RenderTokenParser extends \Twig_TokenParser
|
class RenderTokenParser extends \Twig_TokenParser
|
||||||
{
|
{
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
"php": ">=5.3.3",
|
"php": ">=5.3.3",
|
||||||
"symfony/twig-bridge": "~2.6",
|
"symfony/twig-bridge": "~2.6",
|
||||||
"symfony/http-foundation": "~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": {
|
"require-dev": {
|
||||||
"symfony/stopwatch": "~2.2",
|
"symfony/stopwatch": "~2.2",
|
||||||
|
Reference in New Issue
Block a user