diff --git a/composer.json b/composer.json index e4a15d5a8..508a43acc 100644 --- a/composer.json +++ b/composer.json @@ -34,9 +34,6 @@ "psr/container": "^1.0" }, "autoload": { - "psr-0" : { - "Twig_" : "lib/" - }, "psr-4" : { "Twig\\" : "src/" } diff --git a/lib/Twig/BaseNodeVisitor.php b/lib/Twig/BaseNodeVisitor.php deleted file mode 100644 index e1191f9ed..000000000 --- a/lib/Twig/BaseNodeVisitor.php +++ /dev/null @@ -1,14 +0,0 @@ -varNameSalt++)); } } - -class_alias('Twig\Compiler', 'Twig_Compiler'); diff --git a/src/Environment.php b/src/Environment.php index 0509bf2c9..99a9e3a4a 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -991,5 +991,3 @@ class Environment ]); } } - -class_alias('Twig\Environment', 'Twig_Environment'); diff --git a/src/Error/Error.php b/src/Error/Error.php index 8ace6b2c5..0487d7502 100644 --- a/src/Error/Error.php +++ b/src/Error/Error.php @@ -259,5 +259,3 @@ class Error extends \Exception } } } - -class_alias('Twig\Error\Error', 'Twig_Error'); diff --git a/src/Error/LoaderError.php b/src/Error/LoaderError.php index dc5a9f1af..7c8c23c19 100644 --- a/src/Error/LoaderError.php +++ b/src/Error/LoaderError.php @@ -19,5 +19,3 @@ namespace Twig\Error; class LoaderError extends Error { } - -class_alias('Twig\Error\LoaderError', 'Twig_Error_Loader'); diff --git a/src/Error/RuntimeError.php b/src/Error/RuntimeError.php index 9b3f36e05..f6b84766c 100644 --- a/src/Error/RuntimeError.php +++ b/src/Error/RuntimeError.php @@ -20,5 +20,3 @@ namespace Twig\Error; class RuntimeError extends Error { } - -class_alias('Twig\Error\RuntimeError', 'Twig_Error_Runtime'); diff --git a/src/Error/SyntaxError.php b/src/Error/SyntaxError.php index efece9256..141b9abdb 100644 --- a/src/Error/SyntaxError.php +++ b/src/Error/SyntaxError.php @@ -44,5 +44,3 @@ class SyntaxError extends Error $this->appendMessage(sprintf(' Did you mean "%s"?', implode('", "', array_keys($alternatives)))); } } - -class_alias('Twig\Error\SyntaxError', 'Twig_Error_Syntax'); diff --git a/src/ExpressionParser.php b/src/ExpressionParser.php index 18eecf414..f4690babd 100644 --- a/src/ExpressionParser.php +++ b/src/ExpressionParser.php @@ -736,5 +736,3 @@ class ExpressionParser return true; } } - -class_alias('Twig\ExpressionParser', 'Twig_ExpressionParser'); diff --git a/src/Extension/AbstractExtension.php b/src/Extension/AbstractExtension.php index 0c012b3e9..422925f31 100644 --- a/src/Extension/AbstractExtension.php +++ b/src/Extension/AbstractExtension.php @@ -43,5 +43,3 @@ abstract class AbstractExtension implements ExtensionInterface return []; } } - -class_alias('Twig\Extension\AbstractExtension', 'Twig_Extension'); diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php index dfc711bbe..7c2aeb33e 100644 --- a/src/Extension/CoreExtension.php +++ b/src/Extension/CoreExtension.php @@ -317,8 +317,6 @@ final class CoreExtension extends AbstractExtension ]; } } - -class_alias('Twig\Extension\CoreExtension', 'Twig_Extension_Core'); } namespace { diff --git a/src/Extension/DebugExtension.php b/src/Extension/DebugExtension.php index 2e8510dfb..842ea6a46 100644 --- a/src/Extension/DebugExtension.php +++ b/src/Extension/DebugExtension.php @@ -31,8 +31,6 @@ final class DebugExtension extends AbstractExtension ]; } } - -class_alias('Twig\Extension\DebugExtension', 'Twig_Extension_Debug'); } namespace { diff --git a/src/Extension/EscaperExtension.php b/src/Extension/EscaperExtension.php index b024ab11b..ff02fa88a 100644 --- a/src/Extension/EscaperExtension.php +++ b/src/Extension/EscaperExtension.php @@ -81,8 +81,6 @@ final class EscaperExtension extends AbstractExtension return $this->defaultStrategy; } } - -class_alias('Twig\Extension\EscaperExtension', 'Twig_Extension_Escaper'); } namespace { diff --git a/src/Extension/ExtensionInterface.php b/src/Extension/ExtensionInterface.php index a08321125..75fa237e1 100644 --- a/src/Extension/ExtensionInterface.php +++ b/src/Extension/ExtensionInterface.php @@ -66,8 +66,3 @@ interface ExtensionInterface */ public function getOperators(); } - -class_alias('Twig\Extension\ExtensionInterface', 'Twig_ExtensionInterface'); - -// Ensure that the aliased name is loaded to keep BC for classes implementing the typehint with the old aliased name. -class_exists('Twig\Environment'); diff --git a/src/Extension/GlobalsInterface.php b/src/Extension/GlobalsInterface.php index 4421271b1..ebc1dff91 100644 --- a/src/Extension/GlobalsInterface.php +++ b/src/Extension/GlobalsInterface.php @@ -28,5 +28,3 @@ interface GlobalsInterface */ public function getGlobals(); } - -class_alias('Twig\Extension\GlobalsInterface', 'Twig_Extension_GlobalsInterface'); diff --git a/src/Extension/InitRuntimeInterface.php b/src/Extension/InitRuntimeInterface.php index d64d3cd1b..076bdbb98 100644 --- a/src/Extension/InitRuntimeInterface.php +++ b/src/Extension/InitRuntimeInterface.php @@ -32,5 +32,3 @@ interface InitRuntimeInterface */ public function initRuntime(Environment $environment); } - -class_alias('Twig\Extension\InitRuntimeInterface', 'Twig_Extension_InitRuntimeInterface'); diff --git a/src/Extension/OptimizerExtension.php b/src/Extension/OptimizerExtension.php index 9552b3589..e1320dbbb 100644 --- a/src/Extension/OptimizerExtension.php +++ b/src/Extension/OptimizerExtension.php @@ -27,5 +27,3 @@ final class OptimizerExtension extends AbstractExtension return [new OptimizerNodeVisitor($this->optimizers)]; } } - -class_alias('Twig\Extension\OptimizerExtension', 'Twig_Extension_Optimizer'); diff --git a/src/Extension/ProfilerExtension.php b/src/Extension/ProfilerExtension.php index ca5367c45..f2d0a1af7 100644 --- a/src/Extension/ProfilerExtension.php +++ b/src/Extension/ProfilerExtension.php @@ -44,5 +44,3 @@ class ProfilerExtension extends AbstractExtension return [new ProfilerNodeVisitor(\get_class($this))]; } } - -class_alias('Twig\Extension\ProfilerExtension', 'Twig_Extension_Profiler'); diff --git a/src/Extension/SandboxExtension.php b/src/Extension/SandboxExtension.php index d16e4edd0..0cebbc431 100644 --- a/src/Extension/SandboxExtension.php +++ b/src/Extension/SandboxExtension.php @@ -121,5 +121,3 @@ final class SandboxExtension extends AbstractExtension return $obj; } } - -class_alias('Twig\Extension\SandboxExtension', 'Twig_Extension_Sandbox'); diff --git a/src/Extension/StagingExtension.php b/src/Extension/StagingExtension.php index 7c0c26c86..251227e5b 100644 --- a/src/Extension/StagingExtension.php +++ b/src/Extension/StagingExtension.php @@ -98,5 +98,3 @@ final class StagingExtension extends AbstractExtension return $this->tests; } } - -class_alias('Twig\Extension\StagingExtension', 'Twig_Extension_Staging'); diff --git a/src/Extension/StringLoaderExtension.php b/src/Extension/StringLoaderExtension.php index d6718620e..6cca646de 100644 --- a/src/Extension/StringLoaderExtension.php +++ b/src/Extension/StringLoaderExtension.php @@ -21,8 +21,6 @@ final class StringLoaderExtension extends AbstractExtension ]; } } - -class_alias('Twig\Extension\StringLoaderExtension', 'Twig_Extension_StringLoader'); } namespace { diff --git a/src/ExtensionSet.php b/src/ExtensionSet.php index dc25b133b..7cf7fa7ee 100644 --- a/src/ExtensionSet.php +++ b/src/ExtensionSet.php @@ -473,5 +473,3 @@ final class ExtensionSet } } } - -class_alias('Twig\ExtensionSet', 'Twig_ExtensionSet'); diff --git a/src/FileExtensionEscapingStrategy.php b/src/FileExtensionEscapingStrategy.php index bc95f3343..d6d8be2ea 100644 --- a/src/FileExtensionEscapingStrategy.php +++ b/src/FileExtensionEscapingStrategy.php @@ -58,5 +58,3 @@ class FileExtensionEscapingStrategy } } } - -class_alias('Twig\FileExtensionEscapingStrategy', 'Twig_FileExtensionEscapingStrategy'); diff --git a/src/Lexer.php b/src/Lexer.php index 649780606..74fb93cad 100644 --- a/src/Lexer.php +++ b/src/Lexer.php @@ -492,5 +492,3 @@ class Lexer $this->state = array_pop($this->states); } } - -class_alias('Twig\Lexer', 'Twig_Lexer'); diff --git a/src/Loader/ArrayLoader.php b/src/Loader/ArrayLoader.php index b03170b23..e2e661244 100644 --- a/src/Loader/ArrayLoader.php +++ b/src/Loader/ArrayLoader.php @@ -82,5 +82,3 @@ final class ArrayLoader implements LoaderInterface, ExistsLoaderInterface, Sourc return true; } } - -class_alias('Twig\Loader\ArrayLoader', 'Twig_Loader_Array'); diff --git a/src/Loader/ChainLoader.php b/src/Loader/ChainLoader.php index edb9df8ca..e62e85692 100644 --- a/src/Loader/ChainLoader.php +++ b/src/Loader/ChainLoader.php @@ -116,5 +116,3 @@ final class ChainLoader implements LoaderInterface, ExistsLoaderInterface, Sourc throw new LoaderError(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : '')); } } - -class_alias('Twig\Loader\ChainLoader', 'Twig_Loader_Chain'); diff --git a/src/Loader/ExistsLoaderInterface.php b/src/Loader/ExistsLoaderInterface.php index aab8bd861..f7054c9aa 100644 --- a/src/Loader/ExistsLoaderInterface.php +++ b/src/Loader/ExistsLoaderInterface.php @@ -19,5 +19,3 @@ namespace Twig\Loader; interface ExistsLoaderInterface extends LoaderInterface { } - -class_alias('Twig\Loader\ExistsLoaderInterface', 'Twig_ExistsLoaderInterface'); diff --git a/src/Loader/FilesystemLoader.php b/src/Loader/FilesystemLoader.php index 9aee620ce..f068dc257 100644 --- a/src/Loader/FilesystemLoader.php +++ b/src/Loader/FilesystemLoader.php @@ -293,5 +293,3 @@ class FilesystemLoader implements LoaderInterface, ExistsLoaderInterface, Source ; } } - -class_alias('Twig\Loader\FilesystemLoader', 'Twig_Loader_Filesystem'); diff --git a/src/Loader/LoaderInterface.php b/src/Loader/LoaderInterface.php index 5ccd2c785..0904e5a97 100644 --- a/src/Loader/LoaderInterface.php +++ b/src/Loader/LoaderInterface.php @@ -65,5 +65,3 @@ interface LoaderInterface */ public function exists($name); } - -class_alias('Twig\Loader\LoaderInterface', 'Twig_LoaderInterface'); diff --git a/src/Loader/SourceContextLoaderInterface.php b/src/Loader/SourceContextLoaderInterface.php index 4fdb17ea5..48171bb72 100644 --- a/src/Loader/SourceContextLoaderInterface.php +++ b/src/Loader/SourceContextLoaderInterface.php @@ -17,5 +17,3 @@ namespace Twig\Loader; interface SourceContextLoaderInterface extends LoaderInterface { } - -class_alias('Twig\Loader\SourceContextLoaderInterface', 'Twig_SourceContextLoaderInterface'); diff --git a/src/Markup.php b/src/Markup.php index 43c890b46..c48268ac4 100644 --- a/src/Markup.php +++ b/src/Markup.php @@ -42,5 +42,3 @@ class Markup implements \Countable, \JsonSerializable return $this->content; } } - -class_alias('Twig\Markup', 'Twig_Markup'); diff --git a/src/Node/AutoEscapeNode.php b/src/Node/AutoEscapeNode.php index 0bd5ae1fd..18077651e 100644 --- a/src/Node/AutoEscapeNode.php +++ b/src/Node/AutoEscapeNode.php @@ -36,5 +36,3 @@ class AutoEscapeNode extends Node $compiler->subcompile($this->getNode('body')); } } - -class_alias('Twig\Node\AutoEscapeNode', 'Twig_Node_AutoEscape'); diff --git a/src/Node/BlockNode.php b/src/Node/BlockNode.php index cafceb95b..2e6adebec 100644 --- a/src/Node/BlockNode.php +++ b/src/Node/BlockNode.php @@ -41,5 +41,3 @@ class BlockNode extends Node ; } } - -class_alias('Twig\Node\BlockNode', 'Twig_Node_Block'); diff --git a/src/Node/BlockReferenceNode.php b/src/Node/BlockReferenceNode.php index c46d8b3e3..03661d8e7 100644 --- a/src/Node/BlockReferenceNode.php +++ b/src/Node/BlockReferenceNode.php @@ -34,5 +34,3 @@ class BlockReferenceNode extends Node implements NodeOutputInterface ; } } - -class_alias('Twig\Node\BlockReferenceNode', 'Twig_Node_BlockReference'); diff --git a/src/Node/BodyNode.php b/src/Node/BodyNode.php index 5290be56d..041cbf685 100644 --- a/src/Node/BodyNode.php +++ b/src/Node/BodyNode.php @@ -19,5 +19,3 @@ namespace Twig\Node; class BodyNode extends Node { } - -class_alias('Twig\Node\BodyNode', 'Twig_Node_Body'); diff --git a/src/Node/CheckSecurityNode.php b/src/Node/CheckSecurityNode.php index 59857ca5a..8877aa100 100644 --- a/src/Node/CheckSecurityNode.php +++ b/src/Node/CheckSecurityNode.php @@ -81,5 +81,3 @@ class CheckSecurityNode extends Node ; } } - -class_alias('Twig\Node\CheckSecurityNode', 'Twig_Node_CheckSecurity'); diff --git a/src/Node/DeprecatedNode.php b/src/Node/DeprecatedNode.php index accd76804..2eb144af9 100644 --- a/src/Node/DeprecatedNode.php +++ b/src/Node/DeprecatedNode.php @@ -51,5 +51,3 @@ class DeprecatedNode extends Node ; } } - -class_alias('Twig\Node\DeprecatedNode', 'Twig_Node_Deprecated'); diff --git a/src/Node/DoNode.php b/src/Node/DoNode.php index d74804c5d..62f959f31 100644 --- a/src/Node/DoNode.php +++ b/src/Node/DoNode.php @@ -36,5 +36,3 @@ class DoNode extends Node ; } } - -class_alias('Twig\Node\DoNode', 'Twig_Node_Do'); diff --git a/src/Node/EmbedNode.php b/src/Node/EmbedNode.php index 4a1ef6fc5..320cfb9e2 100644 --- a/src/Node/EmbedNode.php +++ b/src/Node/EmbedNode.php @@ -46,5 +46,3 @@ class EmbedNode extends IncludeNode ; } } - -class_alias('Twig\Node\EmbedNode', 'Twig_Node_Embed'); diff --git a/src/Node/Expression/AbstractExpression.php b/src/Node/Expression/AbstractExpression.php index a3528924c..42da0559d 100644 --- a/src/Node/Expression/AbstractExpression.php +++ b/src/Node/Expression/AbstractExpression.php @@ -22,5 +22,3 @@ use Twig\Node\Node; abstract class AbstractExpression extends Node { } - -class_alias('Twig\Node\Expression\AbstractExpression', 'Twig_Node_Expression'); diff --git a/src/Node/Expression/ArrayExpression.php b/src/Node/Expression/ArrayExpression.php index 917675d91..bc90dbb26 100644 --- a/src/Node/Expression/ArrayExpression.php +++ b/src/Node/Expression/ArrayExpression.php @@ -84,5 +84,3 @@ class ArrayExpression extends AbstractExpression $compiler->raw(']'); } } - -class_alias('Twig\Node\Expression\ArrayExpression', 'Twig_Node_Expression_Array'); diff --git a/src/Node/Expression/AssignNameExpression.php b/src/Node/Expression/AssignNameExpression.php index 62c4ac0b4..2b1eec826 100644 --- a/src/Node/Expression/AssignNameExpression.php +++ b/src/Node/Expression/AssignNameExpression.php @@ -25,5 +25,3 @@ class AssignNameExpression extends NameExpression ; } } - -class_alias('Twig\Node\Expression\AssignNameExpression', 'Twig_Node_Expression_AssignName'); diff --git a/src/Node/Expression/Binary/AbstractBinary.php b/src/Node/Expression/Binary/AbstractBinary.php index 67c388aea..15a6c1081 100644 --- a/src/Node/Expression/Binary/AbstractBinary.php +++ b/src/Node/Expression/Binary/AbstractBinary.php @@ -40,5 +40,3 @@ abstract class AbstractBinary extends AbstractExpression abstract public function operator(Compiler $compiler); } - -class_alias('Twig\Node\Expression\Binary\AbstractBinary', 'Twig_Node_Expression_Binary'); diff --git a/src/Node/Expression/Binary/AddBinary.php b/src/Node/Expression/Binary/AddBinary.php index f7719a19e..ad456b0f4 100644 --- a/src/Node/Expression/Binary/AddBinary.php +++ b/src/Node/Expression/Binary/AddBinary.php @@ -21,5 +21,3 @@ class AddBinary extends AbstractBinary return $compiler->raw('+'); } } - -class_alias('Twig\Node\Expression\Binary\AddBinary', 'Twig_Node_Expression_Binary_Add'); diff --git a/src/Node/Expression/Binary/AndBinary.php b/src/Node/Expression/Binary/AndBinary.php index 484597da7..d0282ff7c 100644 --- a/src/Node/Expression/Binary/AndBinary.php +++ b/src/Node/Expression/Binary/AndBinary.php @@ -21,5 +21,3 @@ class AndBinary extends AbstractBinary return $compiler->raw('&&'); } } - -class_alias('Twig\Node\Expression\Binary\AndBinary', 'Twig_Node_Expression_Binary_And'); diff --git a/src/Node/Expression/Binary/BitwiseAndBinary.php b/src/Node/Expression/Binary/BitwiseAndBinary.php index cf286912b..5e2507ddf 100644 --- a/src/Node/Expression/Binary/BitwiseAndBinary.php +++ b/src/Node/Expression/Binary/BitwiseAndBinary.php @@ -21,5 +21,3 @@ class BitwiseAndBinary extends AbstractBinary return $compiler->raw('&'); } } - -class_alias('Twig\Node\Expression\Binary\BitwiseAndBinary', 'Twig_Node_Expression_Binary_BitwiseAnd'); diff --git a/src/Node/Expression/Binary/BitwiseOrBinary.php b/src/Node/Expression/Binary/BitwiseOrBinary.php index 7d5d26007..5a596f53d 100644 --- a/src/Node/Expression/Binary/BitwiseOrBinary.php +++ b/src/Node/Expression/Binary/BitwiseOrBinary.php @@ -21,5 +21,3 @@ class BitwiseOrBinary extends AbstractBinary return $compiler->raw('|'); } } - -class_alias('Twig\Node\Expression\Binary\BitwiseOrBinary', 'Twig_Node_Expression_Binary_BitwiseOr'); diff --git a/src/Node/Expression/Binary/BitwiseXorBinary.php b/src/Node/Expression/Binary/BitwiseXorBinary.php index 729198719..5adce0089 100644 --- a/src/Node/Expression/Binary/BitwiseXorBinary.php +++ b/src/Node/Expression/Binary/BitwiseXorBinary.php @@ -21,5 +21,3 @@ class BitwiseXorBinary extends AbstractBinary return $compiler->raw('^'); } } - -class_alias('Twig\Node\Expression\Binary\BitwiseXorBinary', 'Twig_Node_Expression_Binary_BitwiseXor'); diff --git a/src/Node/Expression/Binary/ConcatBinary.php b/src/Node/Expression/Binary/ConcatBinary.php index f6e5938fd..b5e4337db 100644 --- a/src/Node/Expression/Binary/ConcatBinary.php +++ b/src/Node/Expression/Binary/ConcatBinary.php @@ -21,5 +21,3 @@ class ConcatBinary extends AbstractBinary return $compiler->raw('.'); } } - -class_alias('Twig\Node\Expression\Binary\ConcatBinary', 'Twig_Node_Expression_Binary_Concat'); diff --git a/src/Node/Expression/Binary/DivBinary.php b/src/Node/Expression/Binary/DivBinary.php index ebfcc758b..498abdde5 100644 --- a/src/Node/Expression/Binary/DivBinary.php +++ b/src/Node/Expression/Binary/DivBinary.php @@ -21,5 +21,3 @@ class DivBinary extends AbstractBinary return $compiler->raw('/'); } } - -class_alias('Twig\Node\Expression\Binary\DivBinary', 'Twig_Node_Expression_Binary_Div'); diff --git a/src/Node/Expression/Binary/EndsWithBinary.php b/src/Node/Expression/Binary/EndsWithBinary.php index 41a0065bb..371a19341 100644 --- a/src/Node/Expression/Binary/EndsWithBinary.php +++ b/src/Node/Expression/Binary/EndsWithBinary.php @@ -33,5 +33,3 @@ class EndsWithBinary extends AbstractBinary return $compiler->raw(''); } } - -class_alias('Twig\Node\Expression\Binary\EndsWithBinary', 'Twig_Node_Expression_Binary_EndsWith'); diff --git a/src/Node/Expression/Binary/EqualBinary.php b/src/Node/Expression/Binary/EqualBinary.php index 84904c364..9af95899a 100644 --- a/src/Node/Expression/Binary/EqualBinary.php +++ b/src/Node/Expression/Binary/EqualBinary.php @@ -20,5 +20,3 @@ class EqualBinary extends AbstractBinary return $compiler->raw('=='); } } - -class_alias('Twig\Node\Expression\Binary\EqualBinary', 'Twig_Node_Expression_Binary_Equal'); diff --git a/src/Node/Expression/Binary/FloorDivBinary.php b/src/Node/Expression/Binary/FloorDivBinary.php index 4dd5e3d32..7c1030bdc 100644 --- a/src/Node/Expression/Binary/FloorDivBinary.php +++ b/src/Node/Expression/Binary/FloorDivBinary.php @@ -27,5 +27,3 @@ class FloorDivBinary extends AbstractBinary return $compiler->raw('/'); } } - -class_alias('Twig\Node\Expression\Binary\FloorDivBinary', 'Twig_Node_Expression_Binary_FloorDiv'); diff --git a/src/Node/Expression/Binary/GreaterBinary.php b/src/Node/Expression/Binary/GreaterBinary.php index be73001e5..dd200bcdd 100644 --- a/src/Node/Expression/Binary/GreaterBinary.php +++ b/src/Node/Expression/Binary/GreaterBinary.php @@ -20,5 +20,3 @@ class GreaterBinary extends AbstractBinary return $compiler->raw('>'); } } - -class_alias('Twig\Node\Expression\Binary\GreaterBinary', 'Twig_Node_Expression_Binary_Greater'); diff --git a/src/Node/Expression/Binary/GreaterEqualBinary.php b/src/Node/Expression/Binary/GreaterEqualBinary.php index 5c2ae72ee..d0287b635 100644 --- a/src/Node/Expression/Binary/GreaterEqualBinary.php +++ b/src/Node/Expression/Binary/GreaterEqualBinary.php @@ -20,5 +20,3 @@ class GreaterEqualBinary extends AbstractBinary return $compiler->raw('>='); } } - -class_alias('Twig\Node\Expression\Binary\GreaterEqualBinary', 'Twig_Node_Expression_Binary_GreaterEqual'); diff --git a/src/Node/Expression/Binary/InBinary.php b/src/Node/Expression/Binary/InBinary.php index f00b23060..540fcdbb9 100644 --- a/src/Node/Expression/Binary/InBinary.php +++ b/src/Node/Expression/Binary/InBinary.php @@ -31,5 +31,3 @@ class InBinary extends AbstractBinary return $compiler->raw('in'); } } - -class_alias('Twig\Node\Expression\Binary\InBinary', 'Twig_Node_Expression_Binary_In'); diff --git a/src/Node/Expression/Binary/LessBinary.php b/src/Node/Expression/Binary/LessBinary.php index 2b202daa7..367ab21f5 100644 --- a/src/Node/Expression/Binary/LessBinary.php +++ b/src/Node/Expression/Binary/LessBinary.php @@ -20,5 +20,3 @@ class LessBinary extends AbstractBinary return $compiler->raw('<'); } } - -class_alias('Twig\Node\Expression\Binary\LessBinary', 'Twig_Node_Expression_Binary_Less'); diff --git a/src/Node/Expression/Binary/LessEqualBinary.php b/src/Node/Expression/Binary/LessEqualBinary.php index 4fffafea6..4c2a795d2 100644 --- a/src/Node/Expression/Binary/LessEqualBinary.php +++ b/src/Node/Expression/Binary/LessEqualBinary.php @@ -20,5 +20,3 @@ class LessEqualBinary extends AbstractBinary return $compiler->raw('<='); } } - -class_alias('Twig\Node\Expression\Binary\LessEqualBinary', 'Twig_Node_Expression_Binary_LessEqual'); diff --git a/src/Node/Expression/Binary/MatchesBinary.php b/src/Node/Expression/Binary/MatchesBinary.php index ae810b266..d01fdbaa3 100644 --- a/src/Node/Expression/Binary/MatchesBinary.php +++ b/src/Node/Expression/Binary/MatchesBinary.php @@ -31,5 +31,3 @@ class MatchesBinary extends AbstractBinary return $compiler->raw(''); } } - -class_alias('Twig\Node\Expression\Binary\MatchesBinary', 'Twig_Node_Expression_Binary_Matches'); diff --git a/src/Node/Expression/Binary/ModBinary.php b/src/Node/Expression/Binary/ModBinary.php index e6a2b3603..09063588d 100644 --- a/src/Node/Expression/Binary/ModBinary.php +++ b/src/Node/Expression/Binary/ModBinary.php @@ -21,5 +21,3 @@ class ModBinary extends AbstractBinary return $compiler->raw('%'); } } - -class_alias('Twig\Node\Expression\Binary\ModBinary', 'Twig_Node_Expression_Binary_Mod'); diff --git a/src/Node/Expression/Binary/MulBinary.php b/src/Node/Expression/Binary/MulBinary.php index cd65f5dff..7879b1bf0 100644 --- a/src/Node/Expression/Binary/MulBinary.php +++ b/src/Node/Expression/Binary/MulBinary.php @@ -21,5 +21,3 @@ class MulBinary extends AbstractBinary return $compiler->raw('*'); } } - -class_alias('Twig\Node\Expression\Binary\MulBinary', 'Twig_Node_Expression_Binary_Mul'); diff --git a/src/Node/Expression/Binary/NotEqualBinary.php b/src/Node/Expression/Binary/NotEqualBinary.php index df5c6a238..fd9818700 100644 --- a/src/Node/Expression/Binary/NotEqualBinary.php +++ b/src/Node/Expression/Binary/NotEqualBinary.php @@ -20,5 +20,3 @@ class NotEqualBinary extends AbstractBinary return $compiler->raw('!='); } } - -class_alias('Twig\Node\Expression\Binary\NotEqualBinary', 'Twig_Node_Expression_Binary_NotEqual'); diff --git a/src/Node/Expression/Binary/NotInBinary.php b/src/Node/Expression/Binary/NotInBinary.php index ed2034e35..fdcbd3fb8 100644 --- a/src/Node/Expression/Binary/NotInBinary.php +++ b/src/Node/Expression/Binary/NotInBinary.php @@ -31,5 +31,3 @@ class NotInBinary extends AbstractBinary return $compiler->raw('not in'); } } - -class_alias('Twig\Node\Expression\Binary\NotInBinary', 'Twig_Node_Expression_Binary_NotIn'); diff --git a/src/Node/Expression/Binary/OrBinary.php b/src/Node/Expression/Binary/OrBinary.php index 8f9da4310..c71f17676 100644 --- a/src/Node/Expression/Binary/OrBinary.php +++ b/src/Node/Expression/Binary/OrBinary.php @@ -21,5 +21,3 @@ class OrBinary extends AbstractBinary return $compiler->raw('||'); } } - -class_alias('Twig\Node\Expression\Binary\OrBinary', 'Twig_Node_Expression_Binary_Or'); diff --git a/src/Node/Expression/Binary/PowerBinary.php b/src/Node/Expression/Binary/PowerBinary.php index 32d0214fd..85ff4ebb9 100644 --- a/src/Node/Expression/Binary/PowerBinary.php +++ b/src/Node/Expression/Binary/PowerBinary.php @@ -20,5 +20,3 @@ class PowerBinary extends AbstractBinary return $compiler->raw('**'); } } - -class_alias('Twig\Node\Expression\Binary\PowerBinary', 'Twig_Node_Expression_Binary_Power'); diff --git a/src/Node/Expression/Binary/RangeBinary.php b/src/Node/Expression/Binary/RangeBinary.php index e9c0cdf5e..06d3b7977 100644 --- a/src/Node/Expression/Binary/RangeBinary.php +++ b/src/Node/Expression/Binary/RangeBinary.php @@ -31,5 +31,3 @@ class RangeBinary extends AbstractBinary return $compiler->raw('..'); } } - -class_alias('Twig\Node\Expression\Binary\RangeBinary', 'Twig_Node_Expression_Binary_Range'); diff --git a/src/Node/Expression/Binary/StartsWithBinary.php b/src/Node/Expression/Binary/StartsWithBinary.php index 1fe59fb41..88e371f2c 100644 --- a/src/Node/Expression/Binary/StartsWithBinary.php +++ b/src/Node/Expression/Binary/StartsWithBinary.php @@ -33,5 +33,3 @@ class StartsWithBinary extends AbstractBinary return $compiler->raw(''); } } - -class_alias('Twig\Node\Expression\Binary\StartsWithBinary', 'Twig_Node_Expression_Binary_StartsWith'); diff --git a/src/Node/Expression/Binary/SubBinary.php b/src/Node/Expression/Binary/SubBinary.php index 25469750a..2c91011d8 100644 --- a/src/Node/Expression/Binary/SubBinary.php +++ b/src/Node/Expression/Binary/SubBinary.php @@ -21,5 +21,3 @@ class SubBinary extends AbstractBinary return $compiler->raw('-'); } } - -class_alias('Twig\Node\Expression\Binary\SubBinary', 'Twig_Node_Expression_Binary_Sub'); diff --git a/src/Node/Expression/BlockReferenceExpression.php b/src/Node/Expression/BlockReferenceExpression.php index c68989ae7..0154e660a 100644 --- a/src/Node/Expression/BlockReferenceExpression.php +++ b/src/Node/Expression/BlockReferenceExpression.php @@ -84,5 +84,3 @@ class BlockReferenceExpression extends AbstractExpression return $compiler->raw(')'); } } - -class_alias('Twig\Node\Expression\BlockReferenceExpression', 'Twig_Node_Expression_BlockReference'); diff --git a/src/Node/Expression/CallExpression.php b/src/Node/Expression/CallExpression.php index 4ecd2c111..455be50c1 100644 --- a/src/Node/Expression/CallExpression.php +++ b/src/Node/Expression/CallExpression.php @@ -309,5 +309,3 @@ abstract class CallExpression extends AbstractExpression return $this->reflector = [$r, $callable]; } } - -class_alias('Twig\Node\Expression\CallExpression', 'Twig_Node_Expression_Call'); diff --git a/src/Node/Expression/ConditionalExpression.php b/src/Node/Expression/ConditionalExpression.php index 8c367d357..aa6625e2f 100644 --- a/src/Node/Expression/ConditionalExpression.php +++ b/src/Node/Expression/ConditionalExpression.php @@ -34,5 +34,3 @@ class ConditionalExpression extends AbstractExpression ; } } - -class_alias('Twig\Node\Expression\ConditionalExpression', 'Twig_Node_Expression_Conditional'); diff --git a/src/Node/Expression/ConstantExpression.php b/src/Node/Expression/ConstantExpression.php index 46e0ac39c..5680b0a05 100644 --- a/src/Node/Expression/ConstantExpression.php +++ b/src/Node/Expression/ConstantExpression.php @@ -26,5 +26,3 @@ class ConstantExpression extends AbstractExpression $compiler->repr($this->getAttribute('value')); } } - -class_alias('Twig\Node\Expression\ConstantExpression', 'Twig_Node_Expression_Constant'); diff --git a/src/Node/Expression/Filter/DefaultFilter.php b/src/Node/Expression/Filter/DefaultFilter.php index 0dacae839..cf7873148 100644 --- a/src/Node/Expression/Filter/DefaultFilter.php +++ b/src/Node/Expression/Filter/DefaultFilter.php @@ -50,5 +50,3 @@ class DefaultFilter extends FilterExpression $compiler->subcompile($this->getNode('node')); } } - -class_alias('Twig\Node\Expression\Filter\DefaultFilter', 'Twig_Node_Expression_Filter_Default'); diff --git a/src/Node/Expression/FilterExpression.php b/src/Node/Expression/FilterExpression.php index 41b07341c..c49e986a1 100644 --- a/src/Node/Expression/FilterExpression.php +++ b/src/Node/Expression/FilterExpression.php @@ -38,5 +38,3 @@ class FilterExpression extends CallExpression $this->compileCallable($compiler); } } - -class_alias('Twig\Node\Expression\FilterExpression', 'Twig_Node_Expression_Filter'); diff --git a/src/Node/Expression/FunctionExpression.php b/src/Node/Expression/FunctionExpression.php index 429dbb924..71269775c 100644 --- a/src/Node/Expression/FunctionExpression.php +++ b/src/Node/Expression/FunctionExpression.php @@ -41,5 +41,3 @@ class FunctionExpression extends CallExpression $this->compileCallable($compiler); } } - -class_alias('Twig\Node\Expression\FunctionExpression', 'Twig_Node_Expression_Function'); diff --git a/src/Node/Expression/GetAttrExpression.php b/src/Node/Expression/GetAttrExpression.php index 7b066170e..ec5b104c2 100644 --- a/src/Node/Expression/GetAttrExpression.php +++ b/src/Node/Expression/GetAttrExpression.php @@ -85,5 +85,3 @@ class GetAttrExpression extends AbstractExpression ; } } - -class_alias('Twig\Node\Expression\GetAttrExpression', 'Twig_Node_Expression_GetAttr'); diff --git a/src/Node/Expression/MethodCallExpression.php b/src/Node/Expression/MethodCallExpression.php index 7450c5180..327cb5fbf 100644 --- a/src/Node/Expression/MethodCallExpression.php +++ b/src/Node/Expression/MethodCallExpression.php @@ -44,5 +44,3 @@ class MethodCallExpression extends AbstractExpression $compiler->raw(')'); } } - -class_alias('Twig\Node\Expression\MethodCallExpression', 'Twig_Node_Expression_MethodCall'); diff --git a/src/Node/Expression/NameExpression.php b/src/Node/Expression/NameExpression.php index ffcb858fe..2192ab685 100644 --- a/src/Node/Expression/NameExpression.php +++ b/src/Node/Expression/NameExpression.php @@ -88,5 +88,3 @@ class NameExpression extends AbstractExpression return !$this->isSpecial() && !$this->getAttribute('is_defined_test'); } } - -class_alias('Twig\Node\Expression\NameExpression', 'Twig_Node_Expression_Name'); diff --git a/src/Node/Expression/NullCoalesceExpression.php b/src/Node/Expression/NullCoalesceExpression.php index c551f2f6f..cc81777c6 100644 --- a/src/Node/Expression/NullCoalesceExpression.php +++ b/src/Node/Expression/NullCoalesceExpression.php @@ -54,5 +54,3 @@ class NullCoalesceExpression extends ConditionalExpression } } } - -class_alias('Twig\Node\Expression\NullCoalesceExpression', 'Twig_Node_Expression_NullCoalesce'); diff --git a/src/Node/Expression/ParentExpression.php b/src/Node/Expression/ParentExpression.php index 294ab398e..6126e52a9 100644 --- a/src/Node/Expression/ParentExpression.php +++ b/src/Node/Expression/ParentExpression.php @@ -44,5 +44,3 @@ class ParentExpression extends AbstractExpression } } } - -class_alias('Twig\Node\Expression\ParentExpression', 'Twig_Node_Expression_Parent'); diff --git a/src/Node/Expression/TempNameExpression.php b/src/Node/Expression/TempNameExpression.php index e7a1a890d..980f0c7c0 100644 --- a/src/Node/Expression/TempNameExpression.php +++ b/src/Node/Expression/TempNameExpression.php @@ -29,5 +29,3 @@ class TempNameExpression extends AbstractExpression ; } } - -class_alias('Twig\Node\Expression\TempNameExpression', 'Twig_Node_Expression_TempName'); diff --git a/src/Node/Expression/Test/ConstantTest.php b/src/Node/Expression/Test/ConstantTest.php index 78353a8b2..02e31c25c 100644 --- a/src/Node/Expression/Test/ConstantTest.php +++ b/src/Node/Expression/Test/ConstantTest.php @@ -47,5 +47,3 @@ class ConstantTest extends TestExpression ; } } - -class_alias('Twig\Node\Expression\Test\ConstantTest', 'Twig_Node_Expression_Test_Constant'); diff --git a/src/Node/Expression/Test/DefinedTest.php b/src/Node/Expression/Test/DefinedTest.php index e87b83577..9d8d52e48 100644 --- a/src/Node/Expression/Test/DefinedTest.php +++ b/src/Node/Expression/Test/DefinedTest.php @@ -69,5 +69,3 @@ class DefinedTest extends TestExpression $compiler->subcompile($this->getNode('node')); } } - -class_alias('Twig\Node\Expression\Test\DefinedTest', 'Twig_Node_Expression_Test_Defined'); diff --git a/src/Node/Expression/Test/DivisiblebyTest.php b/src/Node/Expression/Test/DivisiblebyTest.php index 05c8ad8f7..08140989b 100644 --- a/src/Node/Expression/Test/DivisiblebyTest.php +++ b/src/Node/Expression/Test/DivisiblebyTest.php @@ -34,5 +34,3 @@ class DivisiblebyTest extends TestExpression ; } } - -class_alias('Twig\Node\Expression\Test\DivisiblebyTest', 'Twig_Node_Expression_Test_Divisibleby'); diff --git a/src/Node/Expression/Test/EvenTest.php b/src/Node/Expression/Test/EvenTest.php index 3b955d26a..ee52464a9 100644 --- a/src/Node/Expression/Test/EvenTest.php +++ b/src/Node/Expression/Test/EvenTest.php @@ -33,5 +33,3 @@ class EvenTest extends TestExpression ; } } - -class_alias('Twig\Node\Expression\Test\EvenTest', 'Twig_Node_Expression_Test_Even'); diff --git a/src/Node/Expression/Test/NullTest.php b/src/Node/Expression/Test/NullTest.php index 24d399781..e9e0995bb 100644 --- a/src/Node/Expression/Test/NullTest.php +++ b/src/Node/Expression/Test/NullTest.php @@ -32,5 +32,3 @@ class NullTest extends TestExpression ; } } - -class_alias('Twig\Node\Expression\Test\NullTest', 'Twig_Node_Expression_Test_Null'); diff --git a/src/Node/Expression/Test/OddTest.php b/src/Node/Expression/Test/OddTest.php index 2dc693a9a..e0a492245 100644 --- a/src/Node/Expression/Test/OddTest.php +++ b/src/Node/Expression/Test/OddTest.php @@ -33,5 +33,3 @@ class OddTest extends TestExpression ; } } - -class_alias('Twig\Node\Expression\Test\OddTest', 'Twig_Node_Expression_Test_Odd'); diff --git a/src/Node/Expression/Test/SameasTest.php b/src/Node/Expression/Test/SameasTest.php index 75f2b82a5..c92a554e6 100644 --- a/src/Node/Expression/Test/SameasTest.php +++ b/src/Node/Expression/Test/SameasTest.php @@ -32,5 +32,3 @@ class SameasTest extends TestExpression ; } } - -class_alias('Twig\Node\Expression\Test\SameasTest', 'Twig_Node_Expression_Test_Sameas'); diff --git a/src/Node/Expression/TestExpression.php b/src/Node/Expression/TestExpression.php index 50aab052b..8f95320c3 100644 --- a/src/Node/Expression/TestExpression.php +++ b/src/Node/Expression/TestExpression.php @@ -40,5 +40,3 @@ class TestExpression extends CallExpression $this->compileCallable($compiler); } } - -class_alias('Twig\Node\Expression\TestExpression', 'Twig_Node_Expression_Test'); diff --git a/src/Node/Expression/Unary/AbstractUnary.php b/src/Node/Expression/Unary/AbstractUnary.php index 4896280f1..45be9a2ab 100644 --- a/src/Node/Expression/Unary/AbstractUnary.php +++ b/src/Node/Expression/Unary/AbstractUnary.php @@ -32,5 +32,3 @@ abstract class AbstractUnary extends AbstractExpression abstract public function operator(Compiler $compiler); } - -class_alias('Twig\Node\Expression\Unary\AbstractUnary', 'Twig_Node_Expression_Unary'); diff --git a/src/Node/Expression/Unary/NegUnary.php b/src/Node/Expression/Unary/NegUnary.php index dfb6f5429..03f5a5828 100644 --- a/src/Node/Expression/Unary/NegUnary.php +++ b/src/Node/Expression/Unary/NegUnary.php @@ -21,5 +21,3 @@ class NegUnary extends AbstractUnary $compiler->raw('-'); } } - -class_alias('Twig\Node\Expression\Unary\NegUnary', 'Twig_Node_Expression_Unary_Neg'); diff --git a/src/Node/Expression/Unary/NotUnary.php b/src/Node/Expression/Unary/NotUnary.php index 7bdde96ff..6ebdaf836 100644 --- a/src/Node/Expression/Unary/NotUnary.php +++ b/src/Node/Expression/Unary/NotUnary.php @@ -21,5 +21,3 @@ class NotUnary extends AbstractUnary $compiler->raw('!'); } } - -class_alias('Twig\Node\Expression\Unary\NotUnary', 'Twig_Node_Expression_Unary_Not'); diff --git a/src/Node/Expression/Unary/PosUnary.php b/src/Node/Expression/Unary/PosUnary.php index 52d5d0c89..43cc4b734 100644 --- a/src/Node/Expression/Unary/PosUnary.php +++ b/src/Node/Expression/Unary/PosUnary.php @@ -21,5 +21,3 @@ class PosUnary extends AbstractUnary $compiler->raw('+'); } } - -class_alias('Twig\Node\Expression\Unary\PosUnary', 'Twig_Node_Expression_Unary_Pos'); diff --git a/src/Node/FlushNode.php b/src/Node/FlushNode.php index b88f3409b..bf399fc50 100644 --- a/src/Node/FlushNode.php +++ b/src/Node/FlushNode.php @@ -33,5 +33,3 @@ class FlushNode extends Node ; } } - -class_alias('Twig\Node\FlushNode', 'Twig_Node_Flush'); diff --git a/src/Node/ForLoopNode.php b/src/Node/ForLoopNode.php index 42aedd7ba..d56d1e4b0 100644 --- a/src/Node/ForLoopNode.php +++ b/src/Node/ForLoopNode.php @@ -52,5 +52,3 @@ class ForLoopNode extends Node } } } - -class_alias('Twig\Node\ForLoopNode', 'Twig_Node_ForLoop'); diff --git a/src/Node/ForNode.php b/src/Node/ForNode.php index 54afe9383..39c84ed35 100644 --- a/src/Node/ForNode.php +++ b/src/Node/ForNode.php @@ -115,5 +115,3 @@ class ForNode extends Node $compiler->write("\$context = array_intersect_key(\$context, \$_parent) + \$_parent;\n"); } } - -class_alias('Twig\Node\ForNode', 'Twig_Node_For'); diff --git a/src/Node/IfNode.php b/src/Node/IfNode.php index 814a6f3a9..0ac829c05 100644 --- a/src/Node/IfNode.php +++ b/src/Node/IfNode.php @@ -68,5 +68,3 @@ class IfNode extends Node ->write("}\n"); } } - -class_alias('Twig\Node\IfNode', 'Twig_Node_If'); diff --git a/src/Node/ImportNode.php b/src/Node/ImportNode.php index e66954bf9..18564ce52 100644 --- a/src/Node/ImportNode.php +++ b/src/Node/ImportNode.php @@ -53,5 +53,3 @@ class ImportNode extends Node $compiler->raw(";\n"); } } - -class_alias('Twig\Node\ImportNode', 'Twig_Node_Import'); diff --git a/src/Node/IncludeNode.php b/src/Node/IncludeNode.php index d45303016..915ed031c 100644 --- a/src/Node/IncludeNode.php +++ b/src/Node/IncludeNode.php @@ -104,5 +104,3 @@ class IncludeNode extends Node implements NodeOutputInterface } } } - -class_alias('Twig\Node\IncludeNode', 'Twig_Node_Include'); diff --git a/src/Node/MacroNode.php b/src/Node/MacroNode.php index dd887e6ee..6ee30d611 100644 --- a/src/Node/MacroNode.php +++ b/src/Node/MacroNode.php @@ -107,5 +107,3 @@ class MacroNode extends Node ; } } - -class_alias('Twig\Node\MacroNode', 'Twig_Node_Macro'); diff --git a/src/Node/ModuleNode.php b/src/Node/ModuleNode.php index 745ec3a39..2b8999f47 100644 --- a/src/Node/ModuleNode.php +++ b/src/Node/ModuleNode.php @@ -466,5 +466,3 @@ class ModuleNode extends Node } } } - -class_alias('Twig\Node\ModuleNode', 'Twig_Node_Module'); diff --git a/src/Node/Node.php b/src/Node/Node.php index 1cc375c4b..956712d2c 100644 --- a/src/Node/Node.php +++ b/src/Node/Node.php @@ -204,8 +204,3 @@ class Node implements \Countable, \IteratorAggregate return $this->sourceContext; } } - -class_alias('Twig\Node\Node', 'Twig_Node'); - -// Ensure that the aliased name is loaded to keep BC for classes implementing the typehint with the old aliased name. -class_exists('Twig\Compiler'); diff --git a/src/Node/NodeCaptureInterface.php b/src/Node/NodeCaptureInterface.php index 474003f34..9fb6a0ca1 100644 --- a/src/Node/NodeCaptureInterface.php +++ b/src/Node/NodeCaptureInterface.php @@ -19,5 +19,3 @@ namespace Twig\Node; interface NodeCaptureInterface { } - -class_alias('Twig\Node\NodeCaptureInterface', 'Twig_NodeCaptureInterface'); diff --git a/src/Node/NodeOutputInterface.php b/src/Node/NodeOutputInterface.php index 8b046ee76..5e35b406b 100644 --- a/src/Node/NodeOutputInterface.php +++ b/src/Node/NodeOutputInterface.php @@ -19,5 +19,3 @@ namespace Twig\Node; interface NodeOutputInterface { } - -class_alias('Twig\Node\NodeOutputInterface', 'Twig_NodeOutputInterface'); diff --git a/src/Node/PrintNode.php b/src/Node/PrintNode.php index fcc086acd..8e9d95cdd 100644 --- a/src/Node/PrintNode.php +++ b/src/Node/PrintNode.php @@ -37,5 +37,3 @@ class PrintNode extends Node implements NodeOutputInterface ; } } - -class_alias('Twig\Node\PrintNode', 'Twig_Node_Print'); diff --git a/src/Node/SandboxNode.php b/src/Node/SandboxNode.php index fe59313bf..c651ea098 100644 --- a/src/Node/SandboxNode.php +++ b/src/Node/SandboxNode.php @@ -43,5 +43,3 @@ class SandboxNode extends Node ; } } - -class_alias('Twig\Node\SandboxNode', 'Twig_Node_Sandbox'); diff --git a/src/Node/SandboxedPrintNode.php b/src/Node/SandboxedPrintNode.php index 54e92e66f..6e7a26d7c 100644 --- a/src/Node/SandboxedPrintNode.php +++ b/src/Node/SandboxedPrintNode.php @@ -50,5 +50,3 @@ class SandboxedPrintNode extends PrintNode } } } - -class_alias('Twig\Node\SandboxedPrintNode', 'Twig_Node_SandboxedPrint'); diff --git a/src/Node/SetNode.php b/src/Node/SetNode.php index 9e1668a46..1e5220107 100644 --- a/src/Node/SetNode.php +++ b/src/Node/SetNode.php @@ -99,5 +99,3 @@ class SetNode extends Node implements NodeCaptureInterface $compiler->raw(";\n"); } } - -class_alias('Twig\Node\SetNode', 'Twig_Node_Set'); diff --git a/src/Node/SpacelessNode.php b/src/Node/SpacelessNode.php index ba951c425..a59c92d79 100644 --- a/src/Node/SpacelessNode.php +++ b/src/Node/SpacelessNode.php @@ -39,5 +39,3 @@ class SpacelessNode extends Node implements NodeOutputInterface ; } } - -class_alias('Twig\Node\SpacelessNode', 'Twig_Node_Spaceless'); diff --git a/src/Node/TextNode.php b/src/Node/TextNode.php index 85640a56e..c300977ca 100644 --- a/src/Node/TextNode.php +++ b/src/Node/TextNode.php @@ -36,5 +36,3 @@ class TextNode extends Node implements NodeOutputInterface ; } } - -class_alias('Twig\Node\TextNode', 'Twig_Node_Text'); diff --git a/src/Node/WithNode.php b/src/Node/WithNode.php index 74d1ea0a3..75adb0c9b 100644 --- a/src/Node/WithNode.php +++ b/src/Node/WithNode.php @@ -68,5 +68,3 @@ class WithNode extends Node ; } } - -class_alias('Twig\Node\WithNode', 'Twig_Node_With'); diff --git a/src/NodeTraverser.php b/src/NodeTraverser.php index e48a7b0f2..f56cf064c 100644 --- a/src/NodeTraverser.php +++ b/src/NodeTraverser.php @@ -77,5 +77,3 @@ final class NodeTraverser return $visitor->leaveNode($node, $this->env); } } - -class_alias('Twig\NodeTraverser', 'Twig_NodeTraverser'); diff --git a/src/NodeVisitor/AbstractNodeVisitor.php b/src/NodeVisitor/AbstractNodeVisitor.php index c11933518..08c45efe6 100644 --- a/src/NodeVisitor/AbstractNodeVisitor.php +++ b/src/NodeVisitor/AbstractNodeVisitor.php @@ -45,5 +45,3 @@ abstract class AbstractNodeVisitor implements NodeVisitorInterface */ abstract protected function doLeaveNode(Node $node, Environment $env); } - -class_alias('Twig\NodeVisitor\AbstractNodeVisitor', 'Twig_BaseNodeVisitor'); diff --git a/src/NodeVisitor/EscaperNodeVisitor.php b/src/NodeVisitor/EscaperNodeVisitor.php index bfbfdc9e1..b8af75be9 100644 --- a/src/NodeVisitor/EscaperNodeVisitor.php +++ b/src/NodeVisitor/EscaperNodeVisitor.php @@ -204,5 +204,3 @@ final class EscaperNodeVisitor extends AbstractNodeVisitor return 0; } } - -class_alias('Twig\NodeVisitor\EscaperNodeVisitor', 'Twig_NodeVisitor_Escaper'); diff --git a/src/NodeVisitor/NodeVisitorInterface.php b/src/NodeVisitor/NodeVisitorInterface.php index 1cd9269fd..cd9103964 100644 --- a/src/NodeVisitor/NodeVisitorInterface.php +++ b/src/NodeVisitor/NodeVisitorInterface.php @@ -44,8 +44,3 @@ interface NodeVisitorInterface */ public function getPriority(); } - -class_alias('Twig\NodeVisitor\NodeVisitorInterface', 'Twig_NodeVisitorInterface'); - -// Ensure that the aliased name is loaded to keep BC for classes implementing the typehint with the old aliased name. -class_exists('Twig\Environment'); diff --git a/src/NodeVisitor/OptimizerNodeVisitor.php b/src/NodeVisitor/OptimizerNodeVisitor.php index 9f7cae4da..6b06f975c 100644 --- a/src/NodeVisitor/OptimizerNodeVisitor.php +++ b/src/NodeVisitor/OptimizerNodeVisitor.php @@ -215,5 +215,3 @@ final class OptimizerNodeVisitor extends AbstractNodeVisitor return 255; } } - -class_alias('Twig\NodeVisitor\OptimizerNodeVisitor', 'Twig_NodeVisitor_Optimizer'); diff --git a/src/NodeVisitor/SafeAnalysisNodeVisitor.php b/src/NodeVisitor/SafeAnalysisNodeVisitor.php index 02a2af436..6c1c260f9 100644 --- a/src/NodeVisitor/SafeAnalysisNodeVisitor.php +++ b/src/NodeVisitor/SafeAnalysisNodeVisitor.php @@ -156,5 +156,3 @@ final class SafeAnalysisNodeVisitor extends AbstractNodeVisitor return 0; } } - -class_alias('Twig\NodeVisitor\SafeAnalysisNodeVisitor', 'Twig_NodeVisitor_SafeAnalysis'); diff --git a/src/NodeVisitor/SandboxNodeVisitor.php b/src/NodeVisitor/SandboxNodeVisitor.php index 9fb432d68..227cf6f2f 100644 --- a/src/NodeVisitor/SandboxNodeVisitor.php +++ b/src/NodeVisitor/SandboxNodeVisitor.php @@ -131,5 +131,3 @@ final class SandboxNodeVisitor extends AbstractNodeVisitor return 0; } } - -class_alias('Twig\NodeVisitor\SandboxNodeVisitor', 'Twig_NodeVisitor_Sandbox'); diff --git a/src/Parser.php b/src/Parser.php index e93df8d0b..590eba2e6 100644 --- a/src/Parser.php +++ b/src/Parser.php @@ -393,5 +393,3 @@ class Parser return $node; } } - -class_alias('Twig\Parser', 'Twig_Parser'); diff --git a/src/Profiler/Dumper/BaseDumper.php b/src/Profiler/Dumper/BaseDumper.php index 1631987bb..a75ee94ee 100644 --- a/src/Profiler/Dumper/BaseDumper.php +++ b/src/Profiler/Dumper/BaseDumper.php @@ -61,5 +61,3 @@ abstract class BaseDumper return $str; } } - -class_alias('Twig\Profiler\Dumper\BaseDumper', 'Twig_Profiler_Dumper_Base'); diff --git a/src/Profiler/Dumper/BlackfireDumper.php b/src/Profiler/Dumper/BlackfireDumper.php index f33342905..259bc157e 100644 --- a/src/Profiler/Dumper/BlackfireDumper.php +++ b/src/Profiler/Dumper/BlackfireDumper.php @@ -70,5 +70,3 @@ EOF; } } } - -class_alias('Twig\Profiler\Dumper\BlackfireDumper', 'Twig_Profiler_Dumper_Blackfire'); diff --git a/src/Profiler/Dumper/HtmlDumper.php b/src/Profiler/Dumper/HtmlDumper.php index 5be5abeb6..93a6f3de7 100644 --- a/src/Profiler/Dumper/HtmlDumper.php +++ b/src/Profiler/Dumper/HtmlDumper.php @@ -45,5 +45,3 @@ final class HtmlDumper extends BaseDumper return sprintf('%.2fms/%.0f%%', $percent > 20 ? self::$colors['big'] : 'auto', $profile->getDuration() * 1000, $percent); } } - -class_alias('Twig\Profiler\Dumper\HtmlDumper', 'Twig_Profiler_Dumper_Html'); diff --git a/src/Profiler/Dumper/TextDumper.php b/src/Profiler/Dumper/TextDumper.php index 395ef9d38..c58baf3a7 100644 --- a/src/Profiler/Dumper/TextDumper.php +++ b/src/Profiler/Dumper/TextDumper.php @@ -33,5 +33,3 @@ final class TextDumper extends BaseDumper return sprintf('%.2fms/%.0f%%', $profile->getDuration() * 1000, $percent); } } - -class_alias('Twig\Profiler\Dumper\TextDumper', 'Twig_Profiler_Dumper_Text'); diff --git a/src/Profiler/Node/EnterProfileNode.php b/src/Profiler/Node/EnterProfileNode.php index 91de5ffc8..74a0fa429 100644 --- a/src/Profiler/Node/EnterProfileNode.php +++ b/src/Profiler/Node/EnterProfileNode.php @@ -40,5 +40,3 @@ class EnterProfileNode extends Node ; } } - -class_alias('Twig\Profiler\Node\EnterProfileNode', 'Twig_Profiler_Node_EnterProfile'); diff --git a/src/Profiler/Node/LeaveProfileNode.php b/src/Profiler/Node/LeaveProfileNode.php index 7fbf4354b..92935b965 100644 --- a/src/Profiler/Node/LeaveProfileNode.php +++ b/src/Profiler/Node/LeaveProfileNode.php @@ -34,5 +34,3 @@ class LeaveProfileNode extends Node ; } } - -class_alias('Twig\Profiler\Node\LeaveProfileNode', 'Twig_Profiler_Node_LeaveProfile'); diff --git a/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php b/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php index f19f6b78f..5b381da3e 100644 --- a/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php +++ b/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php @@ -74,5 +74,3 @@ final class ProfilerNodeVisitor extends AbstractNodeVisitor return 0; } } - -class_alias('Twig\Profiler\NodeVisitor\ProfilerNodeVisitor', 'Twig_Profiler_NodeVisitor_Profiler'); diff --git a/src/Profiler/Profile.php b/src/Profiler/Profile.php index e9726d6d6..c6825135f 100644 --- a/src/Profiler/Profile.php +++ b/src/Profiler/Profile.php @@ -188,5 +188,3 @@ class Profile implements \IteratorAggregate, \Serializable list($this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles) = $data; } } - -class_alias('Twig\Profiler\Profile', 'Twig_Profiler_Profile'); diff --git a/src/RuntimeLoader/ContainerRuntimeLoader.php b/src/RuntimeLoader/ContainerRuntimeLoader.php index 04a6602f2..0d5cdedf1 100644 --- a/src/RuntimeLoader/ContainerRuntimeLoader.php +++ b/src/RuntimeLoader/ContainerRuntimeLoader.php @@ -37,5 +37,3 @@ class ContainerRuntimeLoader implements RuntimeLoaderInterface } } } - -class_alias('Twig\RuntimeLoader\ContainerRuntimeLoader', 'Twig_ContainerRuntimeLoader'); diff --git a/src/RuntimeLoader/FactoryRuntimeLoader.php b/src/RuntimeLoader/FactoryRuntimeLoader.php index e4676f7cf..fef0b9c67 100644 --- a/src/RuntimeLoader/FactoryRuntimeLoader.php +++ b/src/RuntimeLoader/FactoryRuntimeLoader.php @@ -37,5 +37,3 @@ class FactoryRuntimeLoader implements RuntimeLoaderInterface } } } - -class_alias('Twig\RuntimeLoader\FactoryRuntimeLoader', 'Twig_FactoryRuntimeLoader'); diff --git a/src/RuntimeLoader/RuntimeLoaderInterface.php b/src/RuntimeLoader/RuntimeLoaderInterface.php index 4eb5ad859..d5ed48270 100644 --- a/src/RuntimeLoader/RuntimeLoaderInterface.php +++ b/src/RuntimeLoader/RuntimeLoaderInterface.php @@ -27,5 +27,3 @@ interface RuntimeLoaderInterface */ public function load($class); } - -class_alias('Twig\RuntimeLoader\RuntimeLoaderInterface', 'Twig_RuntimeLoaderInterface'); diff --git a/src/Sandbox/SecurityError.php b/src/Sandbox/SecurityError.php index 5f96d46bd..30a404f28 100644 --- a/src/Sandbox/SecurityError.php +++ b/src/Sandbox/SecurityError.php @@ -21,5 +21,3 @@ use Twig\Error\Error; class SecurityError extends Error { } - -class_alias('Twig\Sandbox\SecurityError', 'Twig_Sandbox_SecurityError'); diff --git a/src/Sandbox/SecurityNotAllowedFilterError.php b/src/Sandbox/SecurityNotAllowedFilterError.php index 767ec5b3d..04561c2a7 100644 --- a/src/Sandbox/SecurityNotAllowedFilterError.php +++ b/src/Sandbox/SecurityNotAllowedFilterError.php @@ -42,5 +42,3 @@ class SecurityNotAllowedFilterError extends SecurityError return $this->filterName; } } - -class_alias('Twig\Sandbox\SecurityNotAllowedFilterError', 'Twig_Sandbox_SecurityNotAllowedFilterError'); diff --git a/src/Sandbox/SecurityNotAllowedFunctionError.php b/src/Sandbox/SecurityNotAllowedFunctionError.php index 5a3013998..b9428f531 100644 --- a/src/Sandbox/SecurityNotAllowedFunctionError.php +++ b/src/Sandbox/SecurityNotAllowedFunctionError.php @@ -42,5 +42,3 @@ class SecurityNotAllowedFunctionError extends SecurityError return $this->functionName; } } - -class_alias('Twig\Sandbox\SecurityNotAllowedFunctionError', 'Twig_Sandbox_SecurityNotAllowedFunctionError'); diff --git a/src/Sandbox/SecurityNotAllowedMethodError.php b/src/Sandbox/SecurityNotAllowedMethodError.php index c8103ea0f..ebbc40451 100644 --- a/src/Sandbox/SecurityNotAllowedMethodError.php +++ b/src/Sandbox/SecurityNotAllowedMethodError.php @@ -49,5 +49,3 @@ class SecurityNotAllowedMethodError extends SecurityError return $this->methodName; } } - -class_alias('Twig\Sandbox\SecurityNotAllowedMethodError', 'Twig_Sandbox_SecurityNotAllowedMethodError'); diff --git a/src/Sandbox/SecurityNotAllowedPropertyError.php b/src/Sandbox/SecurityNotAllowedPropertyError.php index d148f08d2..4c1c67e76 100644 --- a/src/Sandbox/SecurityNotAllowedPropertyError.php +++ b/src/Sandbox/SecurityNotAllowedPropertyError.php @@ -49,5 +49,3 @@ class SecurityNotAllowedPropertyError extends SecurityError return $this->propertyName; } } - -class_alias('Twig\Sandbox\SecurityNotAllowedPropertyError', 'Twig_Sandbox_SecurityNotAllowedPropertyError'); diff --git a/src/Sandbox/SecurityNotAllowedTagError.php b/src/Sandbox/SecurityNotAllowedTagError.php index 25f636113..c19378acf 100644 --- a/src/Sandbox/SecurityNotAllowedTagError.php +++ b/src/Sandbox/SecurityNotAllowedTagError.php @@ -42,5 +42,3 @@ class SecurityNotAllowedTagError extends SecurityError return $this->tagName; } } - -class_alias('Twig\Sandbox\SecurityNotAllowedTagError', 'Twig_Sandbox_SecurityNotAllowedTagError'); diff --git a/src/Sandbox/SecurityPolicy.php b/src/Sandbox/SecurityPolicy.php index 01fecf804..141a30739 100644 --- a/src/Sandbox/SecurityPolicy.php +++ b/src/Sandbox/SecurityPolicy.php @@ -124,5 +124,3 @@ final class SecurityPolicy implements SecurityPolicyInterface } } } - -class_alias('Twig\Sandbox\SecurityPolicy', 'Twig_Sandbox_SecurityPolicy'); diff --git a/src/Sandbox/SecurityPolicyInterface.php b/src/Sandbox/SecurityPolicyInterface.php index 8b2ab4a9c..565488a8b 100644 --- a/src/Sandbox/SecurityPolicyInterface.php +++ b/src/Sandbox/SecurityPolicyInterface.php @@ -33,5 +33,3 @@ interface SecurityPolicyInterface */ public function checkPropertyAllowed($obj, $method); } - -class_alias('Twig\Sandbox\SecurityPolicyInterface', 'Twig_Sandbox_SecurityPolicyInterface'); diff --git a/src/Source.php b/src/Source.php index a72877880..2b28d4335 100644 --- a/src/Source.php +++ b/src/Source.php @@ -49,5 +49,3 @@ final class Source return $this->path; } } - -class_alias('Twig\Source', 'Twig_Source'); diff --git a/src/Template.php b/src/Template.php index b54838d32..ed49b01c3 100644 --- a/src/Template.php +++ b/src/Template.php @@ -421,5 +421,3 @@ abstract class Template */ abstract protected function doDisplay(array $context, array $blocks = []); } - -class_alias('Twig\Template', 'Twig_Template'); diff --git a/src/TemplateWrapper.php b/src/TemplateWrapper.php index e5268668b..32b964e49 100644 --- a/src/TemplateWrapper.php +++ b/src/TemplateWrapper.php @@ -137,5 +137,3 @@ final class TemplateWrapper return $this->template; } } - -class_alias('Twig\TemplateWrapper', 'Twig_TemplateWrapper'); diff --git a/src/Test/IntegrationTestCase.php b/src/Test/IntegrationTestCase.php index d9c329029..1bad54915 100644 --- a/src/Test/IntegrationTestCase.php +++ b/src/Test/IntegrationTestCase.php @@ -263,5 +263,3 @@ abstract class IntegrationTestCase extends TestCase return $templates; } } - -class_alias('Twig\Test\IntegrationTestCase', 'Twig_Test_IntegrationTestCase'); diff --git a/src/Test/NodeTestCase.php b/src/Test/NodeTestCase.php index 368ceb104..646402417 100644 --- a/src/Test/NodeTestCase.php +++ b/src/Test/NodeTestCase.php @@ -63,5 +63,3 @@ abstract class NodeTestCase extends TestCase return 'twig_get_attribute($this->env, $this->source, '; } } - -class_alias('Twig\Test\NodeTestCase', 'Twig_Test_NodeTestCase'); diff --git a/src/Token.php b/src/Token.php index ee452d67a..caf6e6eeb 100644 --- a/src/Token.php +++ b/src/Token.php @@ -203,5 +203,3 @@ final class Token } } } - -class_alias('Twig\Token', 'Twig_Token'); diff --git a/src/TokenParser/AbstractTokenParser.php b/src/TokenParser/AbstractTokenParser.php index fc8c11a23..233dbfd0e 100644 --- a/src/TokenParser/AbstractTokenParser.php +++ b/src/TokenParser/AbstractTokenParser.php @@ -27,5 +27,3 @@ abstract class AbstractTokenParser implements TokenParserInterface $this->parser = $parser; } } - -class_alias('Twig\TokenParser\AbstractTokenParser', 'Twig_TokenParser'); diff --git a/src/TokenParser/AutoEscapeTokenParser.php b/src/TokenParser/AutoEscapeTokenParser.php index 10fdb8180..621c84c25 100644 --- a/src/TokenParser/AutoEscapeTokenParser.php +++ b/src/TokenParser/AutoEscapeTokenParser.php @@ -53,5 +53,3 @@ final class AutoEscapeTokenParser extends AbstractTokenParser return 'autoescape'; } } - -class_alias('Twig\TokenParser\AutoEscapeTokenParser', 'Twig_TokenParser_AutoEscape'); diff --git a/src/TokenParser/BlockTokenParser.php b/src/TokenParser/BlockTokenParser.php index 449a2c05e..4f940a7d9 100644 --- a/src/TokenParser/BlockTokenParser.php +++ b/src/TokenParser/BlockTokenParser.php @@ -74,5 +74,3 @@ final class BlockTokenParser extends AbstractTokenParser return 'block'; } } - -class_alias('Twig\TokenParser\BlockTokenParser', 'Twig_TokenParser_Block'); diff --git a/src/TokenParser/DeprecatedTokenParser.php b/src/TokenParser/DeprecatedTokenParser.php index 6575cff16..e5d1fb3c5 100644 --- a/src/TokenParser/DeprecatedTokenParser.php +++ b/src/TokenParser/DeprecatedTokenParser.php @@ -40,5 +40,3 @@ class DeprecatedTokenParser extends AbstractTokenParser return 'deprecated'; } } - -class_alias('Twig\TokenParser\DeprecatedTokenParser', 'Twig_TokenParser_Deprecated'); diff --git a/src/TokenParser/DoTokenParser.php b/src/TokenParser/DoTokenParser.php index e5a07d69b..a806f373c 100644 --- a/src/TokenParser/DoTokenParser.php +++ b/src/TokenParser/DoTokenParser.php @@ -33,5 +33,3 @@ final class DoTokenParser extends AbstractTokenParser return 'do'; } } - -class_alias('Twig\TokenParser\DoTokenParser', 'Twig_TokenParser_Do'); diff --git a/src/TokenParser/EmbedTokenParser.php b/src/TokenParser/EmbedTokenParser.php index 83a545e7b..745cf5095 100644 --- a/src/TokenParser/EmbedTokenParser.php +++ b/src/TokenParser/EmbedTokenParser.php @@ -68,5 +68,3 @@ final class EmbedTokenParser extends IncludeTokenParser return 'embed'; } } - -class_alias('Twig\TokenParser\EmbedTokenParser', 'Twig_TokenParser_Embed'); diff --git a/src/TokenParser/ExtendsTokenParser.php b/src/TokenParser/ExtendsTokenParser.php index a2e6b54b0..96bf6b802 100644 --- a/src/TokenParser/ExtendsTokenParser.php +++ b/src/TokenParser/ExtendsTokenParser.php @@ -46,5 +46,3 @@ final class ExtendsTokenParser extends AbstractTokenParser return 'extends'; } } - -class_alias('Twig\TokenParser\ExtendsTokenParser', 'Twig_TokenParser_Extends'); diff --git a/src/TokenParser/FilterTokenParser.php b/src/TokenParser/FilterTokenParser.php index fc15baa9e..985f24317 100644 --- a/src/TokenParser/FilterTokenParser.php +++ b/src/TokenParser/FilterTokenParser.php @@ -53,5 +53,3 @@ final class FilterTokenParser extends AbstractTokenParser return 'filter'; } } - -class_alias('Twig\TokenParser\FilterTokenParser', 'Twig_TokenParser_Filter'); diff --git a/src/TokenParser/FlushTokenParser.php b/src/TokenParser/FlushTokenParser.php index 70f433939..1297a2c80 100644 --- a/src/TokenParser/FlushTokenParser.php +++ b/src/TokenParser/FlushTokenParser.php @@ -33,5 +33,3 @@ final class FlushTokenParser extends AbstractTokenParser return 'flush'; } } - -class_alias('Twig\TokenParser\FlushTokenParser', 'Twig_TokenParser_Flush'); diff --git a/src/TokenParser/ForTokenParser.php b/src/TokenParser/ForTokenParser.php index ad3ea8587..91f84309a 100644 --- a/src/TokenParser/ForTokenParser.php +++ b/src/TokenParser/ForTokenParser.php @@ -131,5 +131,3 @@ final class ForTokenParser extends AbstractTokenParser return 'for'; } } - -class_alias('Twig\TokenParser\ForTokenParser', 'Twig_TokenParser_For'); diff --git a/src/TokenParser/FromTokenParser.php b/src/TokenParser/FromTokenParser.php index de03586f6..32349aaf4 100644 --- a/src/TokenParser/FromTokenParser.php +++ b/src/TokenParser/FromTokenParser.php @@ -60,5 +60,3 @@ final class FromTokenParser extends AbstractTokenParser return 'from'; } } - -class_alias('Twig\TokenParser\FromTokenParser', 'Twig_TokenParser_From'); diff --git a/src/TokenParser/IfTokenParser.php b/src/TokenParser/IfTokenParser.php index 8ad99f074..367e968b8 100644 --- a/src/TokenParser/IfTokenParser.php +++ b/src/TokenParser/IfTokenParser.php @@ -85,5 +85,3 @@ final class IfTokenParser extends AbstractTokenParser return 'if'; } } - -class_alias('Twig\TokenParser\IfTokenParser', 'Twig_TokenParser_If'); diff --git a/src/TokenParser/ImportTokenParser.php b/src/TokenParser/ImportTokenParser.php index 4b8c3db89..b7ad66565 100644 --- a/src/TokenParser/ImportTokenParser.php +++ b/src/TokenParser/ImportTokenParser.php @@ -39,5 +39,3 @@ final class ImportTokenParser extends AbstractTokenParser return 'import'; } } - -class_alias('Twig\TokenParser\ImportTokenParser', 'Twig_TokenParser_Import'); diff --git a/src/TokenParser/IncludeTokenParser.php b/src/TokenParser/IncludeTokenParser.php index e1e95da3d..a9e4f8187 100644 --- a/src/TokenParser/IncludeTokenParser.php +++ b/src/TokenParser/IncludeTokenParser.php @@ -64,5 +64,3 @@ class IncludeTokenParser extends AbstractTokenParser return 'include'; } } - -class_alias('Twig\TokenParser\IncludeTokenParser', 'Twig_TokenParser_Include'); diff --git a/src/TokenParser/MacroTokenParser.php b/src/TokenParser/MacroTokenParser.php index d26738767..cc8684ff4 100644 --- a/src/TokenParser/MacroTokenParser.php +++ b/src/TokenParser/MacroTokenParser.php @@ -62,5 +62,3 @@ final class MacroTokenParser extends AbstractTokenParser return 'macro'; } } - -class_alias('Twig\TokenParser\MacroTokenParser', 'Twig_TokenParser_Macro'); diff --git a/src/TokenParser/SandboxTokenParser.php b/src/TokenParser/SandboxTokenParser.php index 1f5798794..14be7e4f7 100644 --- a/src/TokenParser/SandboxTokenParser.php +++ b/src/TokenParser/SandboxTokenParser.php @@ -61,5 +61,3 @@ final class SandboxTokenParser extends AbstractTokenParser return 'sandbox'; } } - -class_alias('Twig\TokenParser\SandboxTokenParser', 'Twig_TokenParser_Sandbox'); diff --git a/src/TokenParser/SetTokenParser.php b/src/TokenParser/SetTokenParser.php index 82fee26ae..202fb1147 100644 --- a/src/TokenParser/SetTokenParser.php +++ b/src/TokenParser/SetTokenParser.php @@ -68,5 +68,3 @@ final class SetTokenParser extends AbstractTokenParser return 'set'; } } - -class_alias('Twig\TokenParser\SetTokenParser', 'Twig_TokenParser_Set'); diff --git a/src/TokenParser/SpacelessTokenParser.php b/src/TokenParser/SpacelessTokenParser.php index c4fd36e86..bffacb57b 100644 --- a/src/TokenParser/SpacelessTokenParser.php +++ b/src/TokenParser/SpacelessTokenParser.php @@ -51,5 +51,3 @@ final class SpacelessTokenParser extends AbstractTokenParser return 'spaceless'; } } - -class_alias('Twig\TokenParser\SpacelessTokenParser', 'Twig_TokenParser_Spaceless'); diff --git a/src/TokenParser/TokenParserInterface.php b/src/TokenParser/TokenParserInterface.php index 6f34106f2..3241ef50e 100644 --- a/src/TokenParser/TokenParserInterface.php +++ b/src/TokenParser/TokenParserInterface.php @@ -44,9 +44,3 @@ interface TokenParserInterface */ public function getTag(); } - -class_alias('Twig\TokenParser\TokenParserInterface', 'Twig_TokenParserInterface'); - -// Ensure that the aliased name is loaded to keep BC for classes implementing the typehint with the old aliased name. -class_exists('Twig\Token'); -class_exists('Twig\Parser'); diff --git a/src/TokenParser/UseTokenParser.php b/src/TokenParser/UseTokenParser.php index 266efe5d9..b1d603d61 100644 --- a/src/TokenParser/UseTokenParser.php +++ b/src/TokenParser/UseTokenParser.php @@ -69,5 +69,3 @@ final class UseTokenParser extends AbstractTokenParser return 'use'; } } - -class_alias('Twig\TokenParser\UseTokenParser', 'Twig_TokenParser_Use'); diff --git a/src/TokenParser/WithTokenParser.php b/src/TokenParser/WithTokenParser.php index c184fd75e..4c88aee03 100644 --- a/src/TokenParser/WithTokenParser.php +++ b/src/TokenParser/WithTokenParser.php @@ -51,5 +51,3 @@ final class WithTokenParser extends AbstractTokenParser return 'with'; } } - -class_alias('Twig\TokenParser\WithTokenParser', 'Twig_TokenParser_With'); diff --git a/src/TokenStream.php b/src/TokenStream.php index a1ecd5669..7071585fe 100644 --- a/src/TokenStream.php +++ b/src/TokenStream.php @@ -129,5 +129,3 @@ final class TokenStream return $this->source; } } - -class_alias('Twig\TokenStream', 'Twig_TokenStream'); diff --git a/src/TwigFilter.php b/src/TwigFilter.php index 9e7b8388e..029815c98 100644 --- a/src/TwigFilter.php +++ b/src/TwigFilter.php @@ -140,11 +140,3 @@ class TwigFilter return $this->options['alternative']; } } - -// For Twig 1.x compatibility -class_alias('Twig\TwigFilter', 'Twig_SimpleFilter', false); - -class_alias('Twig\TwigFilter', 'Twig_Filter'); - -// Ensure that the aliased name is loaded to keep BC for classes implementing the typehint with the old aliased name. -class_exists('Twig\Node\Node'); diff --git a/src/TwigFunction.php b/src/TwigFunction.php index c5779af61..710c6d40c 100644 --- a/src/TwigFunction.php +++ b/src/TwigFunction.php @@ -130,11 +130,3 @@ class TwigFunction return $this->options['alternative']; } } - -// For Twig 1.x compatibility -class_alias('Twig\TwigFunction', 'Twig_SimpleFunction', false); - -class_alias('Twig\TwigFunction', 'Twig_Function'); - -// Ensure that the aliased name is loaded to keep BC for classes implementing the typehint with the old aliased name. -class_exists('Twig\Node\Node'); diff --git a/src/TwigTest.php b/src/TwigTest.php index e15da41cb..e6624f3ac 100644 --- a/src/TwigTest.php +++ b/src/TwigTest.php @@ -102,8 +102,3 @@ class TwigTest return $this->options['alternative']; } } - -// For Twig 1.x compatibility -class_alias('Twig\TwigTest', 'Twig_SimpleTest', false); - -class_alias('Twig\TwigTest', 'Twig_Test'); diff --git a/src/Util/DeprecationCollector.php b/src/Util/DeprecationCollector.php index d37369841..efe54dde0 100644 --- a/src/Util/DeprecationCollector.php +++ b/src/Util/DeprecationCollector.php @@ -75,5 +75,3 @@ final class DeprecationCollector return $deprecations; } } - -class_alias('Twig\Util\DeprecationCollector', 'Twig_Util_DeprecationCollector'); diff --git a/src/Util/TemplateDirIterator.php b/src/Util/TemplateDirIterator.php index 1ab0dac59..c7339fd78 100644 --- a/src/Util/TemplateDirIterator.php +++ b/src/Util/TemplateDirIterator.php @@ -26,5 +26,3 @@ class TemplateDirIterator extends \IteratorIterator return (string) parent::key(); } } - -class_alias('Twig\Util\TemplateDirIterator', 'Twig_Util_TemplateDirIterator'); diff --git a/test/Twig/Tests/EnvironmentTest.php b/test/Twig/Tests/EnvironmentTest.php index 27fdc99cc..e118888bb 100644 --- a/test/Twig/Tests/EnvironmentTest.php +++ b/test/Twig/Tests/EnvironmentTest.php @@ -451,7 +451,6 @@ class Twig_Tests_EnvironmentTest_Extension extends AbstractExtension implements ]; } } -class_alias('Twig_Tests_EnvironmentTest_Extension', 'Twig\Tests\EnvironmentTest\Extension', false); class Twig_Tests_EnvironmentTest_TokenParser extends AbstractTokenParser {