diff --git a/lib/Twig/ExistsLoaderInterface.php b/lib/Twig/ExistsLoaderInterface.php index a4fb5002d..d8b89e236 100644 --- a/lib/Twig/ExistsLoaderInterface.php +++ b/lib/Twig/ExistsLoaderInterface.php @@ -11,8 +11,6 @@ /** * Empty interface for Twig 1.x compatibility. - * - * @deprecated to be removed in 3.0 */ interface Twig_ExistsLoaderInterface extends Twig_LoaderInterface { diff --git a/lib/Twig/Extension/InitRuntimeInterface.php b/lib/Twig/Extension/InitRuntimeInterface.php index d4d993c7d..d883c7df1 100644 --- a/lib/Twig/Extension/InitRuntimeInterface.php +++ b/lib/Twig/Extension/InitRuntimeInterface.php @@ -16,8 +16,6 @@ * deprecated initRuntime() method in your extensions. * * @author Fabien Potencier - * - * @deprecated to be removed in 3.0 */ interface Twig_Extension_InitRuntimeInterface { diff --git a/lib/Twig/Parser.php b/lib/Twig/Parser.php index 56532a963..0717128e3 100644 --- a/lib/Twig/Parser.php +++ b/lib/Twig/Parser.php @@ -259,14 +259,8 @@ class Twig_Parser { $this->macros[$name] = $node; } - - /** - * @deprecated since 2.0. Will be removed in 3.0. There is no reserved macro names anymore - */ public function isReservedMacroName($name) { - @trigger_error('The '.__METHOD__.' method is deprecated since version 2.0 and will be removed in 3.0.', E_USER_DEPRECATED); - return false; } diff --git a/lib/Twig/SimpleFilter.php b/lib/Twig/SimpleFilter.php index b5aaa3990..30bdd6a50 100644 --- a/lib/Twig/SimpleFilter.php +++ b/lib/Twig/SimpleFilter.php @@ -11,8 +11,6 @@ /** * Empty class for Twig 1.x compatibility. - * - * @deprecated to be removed in 3.0 */ class Twig_SimpleFilter extends Twig_Filter { diff --git a/lib/Twig/SimpleFunction.php b/lib/Twig/SimpleFunction.php index 4a716b625..db91a7947 100644 --- a/lib/Twig/SimpleFunction.php +++ b/lib/Twig/SimpleFunction.php @@ -11,8 +11,6 @@ /** * Empty class for Twig 1.x compatibility. - * - * @deprecated to be removed in 3.0 */ class Twig_SimpleFunction extends Twig_Function { diff --git a/lib/Twig/SimpleTest.php b/lib/Twig/SimpleTest.php index 0f49d7253..84c582e54 100644 --- a/lib/Twig/SimpleTest.php +++ b/lib/Twig/SimpleTest.php @@ -11,8 +11,6 @@ /** * Empty class for Twig 1.x compatibility. - * - * @deprecated to be removed in 3.0 */ class Twig_SimpleTest extends Twig_Test {