feature #2484 Add namespaced aliases (nicolas-grekas)

This PR was squashed before being merged into the 1.x branch (closes #2484).

Discussion
----------

Add namespaced aliases

Commits
-------

5420a5e Add the aliases
71af32b Add namespaced aliases

CHANGELOG

@@ -1,5 +1,6 @@
 * 1.34.0 (2017-XX-XX)
 
+ * added namespaced aliases for all (non-deprecated) classes and interfaces
  * dropped HHVM support
  * dropped PHP 5.2 support
 

composer.json

@@ -37,6 +37,9 @@
     "autoload": {
         "psr-0" : {
             "Twig_" : "lib/"
+        },
+        "psr-4" : {
+            "Twig\\" : "src/"
         }
     },
     "extra": {

lib/Twig/BaseNodeVisitor.php

@@ -48,3 +48,5 @@ abstract protected function doEnterNode(Twig_Node $node, Twig_Environment $env);
      */
     abstract protected function doLeaveNode(Twig_Node $node, Twig_Environment $env);
 }
+
+class_alias('Twig_BaseNodeVisitor', 'Twig\NodeVisitor\AbstractNodeVisitor', false);

lib/Twig/Cache/Filesystem.php

@@ -89,3 +89,5 @@ public function getTimestamp($key)
         return (int) @filemtime($key);
     }
 }
+
+class_alias('Twig_Cache_Filesystem', 'Twig\Cache\FilesystemCache', false);

lib/Twig/Cache/Null.php

@@ -36,3 +36,5 @@ public function getTimestamp($key)
         return 0;
     }
 }
+
+class_alias('Twig_Cache_Null', 'Twig\Cache\NullCache', false);

lib/Twig/CacheInterface.php

@@ -54,3 +54,5 @@ public function load($key);
      */
     public function getTimestamp($key);
 }
+
+class_alias('Twig_CacheInterface', 'Twig\Cache\CacheInterface', false);

lib/Twig/Compiler.php

@@ -279,3 +279,5 @@ public function getVarName()
         return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
     }
 }
+
+class_alias('Twig_Compiler', 'Twig\Compiler', false);

lib/Twig/ContainerRuntimeLoader.php

@@ -35,3 +35,5 @@ public function load($class)
         }
     }
 }
+
+class_alias('Twig_ContainerRuntimeLoader', 'Twig\RuntimeLoader\ContainerRuntimeLoader', false);

lib/Twig/Environment.php

@@ -1559,3 +1559,5 @@ private function updateOptionsHash()
         $this->optionsHash = implode(':', $hashParts);
     }
 }
+
+class_alias('Twig_Environment', 'Twig\Environment', false);

lib/Twig/Error.php

@@ -358,3 +358,5 @@ protected function guessTemplateInfo()
         }
     }
 }
+
+class_alias('Twig_Error', 'Twig\Error\Error', false);

lib/Twig/Error/Loader.php

@@ -36,3 +36,5 @@ public function __construct($message, $lineno = -1, $source = null, Exception $p
         $this->setTemplateLine(false);
     }
 }
+
+class_alias('Twig_Error_Loader', 'Twig\Error\LoaderError', false);

lib/Twig/Error/Runtime.php

@@ -18,3 +18,5 @@
 class Twig_Error_Runtime extends Twig_Error
 {
 }
+
+class_alias('Twig_Error_Runtime', 'Twig\Error\RuntimeError', false);

lib/Twig/Error/Syntax.php

@@ -51,3 +51,5 @@ public static function computeAlternatives($name, $items)
         return array_keys($alternatives);
     }
 }
+
+class_alias('Twig_Error_Syntax', 'Twig\Error\SyntaxError', false);

lib/Twig/ExpressionParser.php

@@ -737,3 +737,5 @@ protected function checkConstantExpression(Twig_NodeInterface $node)
         return true;
     }
 }
+
+class_alias('Twig_ExpressionParser', 'Twig\ExpressionParser', false);

lib/Twig/Extension.php

@@ -63,3 +63,5 @@ public function getName()
         return get_class($this);
     }
 }
+
+class_alias('Twig_Extension', 'Twig\Extension\AbstractExtension', false);

lib/Twig/Extension/Core.php

@@ -1608,3 +1608,5 @@ function twig_array_batch($items, $size, $fill = null)
 
     return $result;
 }
+
+class_alias('Twig_Extension_Core', 'Twig\Extension\CoreExtension', false);

lib/Twig/Extension/Debug.php

@@ -23,7 +23,7 @@ public function getFunctions()
             // false means that it was not set (and the default is on) or it explicitly enabled
             // xdebug.overload_var_dump produces HTML only when html_errors is also enabled
             && (false === ini_get('html_errors') || ini_get('html_errors'))
-            || 'cli' === php_sapi_name()
+            || 'cli' === PHP_SAPI
         ;
 
         return array(
@@ -63,3 +63,5 @@ function twig_var_dump(Twig_Environment $env, $context)
 
     return ob_get_clean();
 }
+
+class_alias('Twig_Extension_Debug', 'Twig\Extension\DebugExtension', false);

lib/Twig/Extension/Escaper.php

@@ -108,3 +108,5 @@ function twig_raw_filter($string)
 {
     return $string;
 }
+
+class_alias('Twig_Extension_Escaper', 'Twig\Extension\EscaperExtension', false);

lib/Twig/Extension/Optimizer.php

@@ -31,3 +31,5 @@ public function getName()
         return 'optimizer';
     }
 }
+
+class_alias('Twig_Extension_Optimizer', 'Twig\Extension\OptimizerExtension', false);

lib/Twig/Extension/Profiler.php

@@ -44,3 +44,5 @@ public function getName()
         return 'profiler';
     }
 }
+
+class_alias('Twig_Extension_Profiler', 'Twig\Extension\ProfilerExtension', false);

lib/Twig/Extension/Sandbox.php

@@ -99,3 +99,5 @@ public function getName()
         return 'sandbox';
     }
 }
+
+class_alias('Twig_Extension_Sandbox', 'Twig\Extension\SandboxExtension', false);

lib/Twig/Extension/Staging.php

@@ -108,3 +108,5 @@ public function getName()
         return 'staging';
     }
 }
+
+class_alias('Twig_Extension_Staging', 'Twig\Extension\StagingExtension', false);

lib/Twig/Extension/StringLoader.php

@@ -43,3 +43,5 @@ function twig_template_from_string(Twig_Environment $env, $template)
 {
     return $env->createTemplate((string) $template);
 }
+
+class_alias('Twig_Extension_StringLoader', 'Twig\Extension\StringLoaderExtension', false);

lib/Twig/ExtensionInterface.php

@@ -85,3 +85,5 @@ public function getGlobals();
      */
     public function getName();
 }
+
+class_alias('Twig_ExtensionInterface', 'Twig\Extension\ExtensionInterface', false);

lib/Twig/FactoryRuntimeLoader.php

@@ -35,3 +35,5 @@ public function load($class)
         }
     }
 }
+
+class_alias('Twig_FactoryRuntimeLoader', 'Twig\RuntimeLoader\FactoryRuntimeLoader', false);

lib/Twig/FileExtensionEscapingStrategy.php

@@ -56,3 +56,5 @@ public static function guess($name)
         }
     }
 }
+
+class_alias('Twig_FileExtensionEscapingStrategy', 'Twig\FileExtensionEscapingStrategy', false);

lib/Twig/Lexer.php

@@ -420,3 +420,5 @@ protected function popState()
         $this->state = array_pop($this->states);
     }
 }
+
+class_alias('Twig_Lexer', 'Twig\Lexer', false);

lib/Twig/Loader/Array.php

@@ -93,3 +93,5 @@ public function isFresh($name, $time)
         return true;
     }
 }
+
+class_alias('Twig_Loader_Array', 'Twig\Loader\ArrayLoader', false);

lib/Twig/Loader/Chain.php

@@ -147,3 +147,5 @@ public function isFresh($name, $time)
         throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
     }
 }
+
+class_alias('Twig_Loader_Chain', 'Twig\Loader\ChainLoader', false);

lib/Twig/Loader/Filesystem.php

@@ -286,3 +286,5 @@ private function isAbsolutePath($file)
         ;
     }
 }
+
+class_alias('Twig_Loader_Filesystem', 'Twig\Loader\FilesystemLoader', false);

lib/Twig/LoaderInterface.php

@@ -53,3 +53,5 @@ public function getCacheKey($name);
      */
     public function isFresh($name, $time);
 }
+
+class_alias('Twig_LoaderInterface', 'Twig\Loader\LoaderInterface', false);

lib/Twig/Markup.php

@@ -35,3 +35,5 @@ public function count()
         return function_exists('mb_get_info') ? mb_strlen($this->content, $this->charset) : strlen($this->content);
     }
 }
+
+class_alias('Twig_Markup', 'Twig\Markup', false);

lib/Twig/Node.php

@@ -251,3 +251,5 @@ public function getFilename()
         return $this->name;
     }
 }
+
+class_alias('Twig_Node', 'Twig\Node\Node', false);

lib/Twig/Node/AutoEscape.php

@@ -32,3 +32,5 @@ public function compile(Twig_Compiler $compiler)
         $compiler->subcompile($this->getNode('body'));
     }
 }
+
+class_alias('Twig_Node_AutoEscape', 'Twig\Node\AutoEscapeNode', false);

lib/Twig/Node/Block.php

@@ -37,3 +37,5 @@ public function compile(Twig_Compiler $compiler)
         ;
     }
 }
+
+class_alias('Twig_Node_Block', 'Twig\Node\BlockNode', false);

lib/Twig/Node/BlockReference.php

@@ -30,3 +30,5 @@ public function compile(Twig_Compiler $compiler)
         ;
     }
 }
+
+class_alias('Twig_Node_BlockReference', 'Twig\Node\BlockReferenceNode', false);

lib/Twig/Node/Body.php

@@ -17,3 +17,5 @@
 class Twig_Node_Body extends Twig_Node
 {
 }
+
+class_alias('Twig_Node_Body', 'Twig\Node\BodyNode', false);

lib/Twig/Node/CheckSecurity.php

@@ -76,3 +76,5 @@ public function compile(Twig_Compiler $compiler)
         ;
     }
 }
+
+class_alias('Twig_Node_CheckSecurity', 'Twig\Node\CheckSecurityNode', false);

lib/Twig/Node/Do.php

@@ -31,3 +31,5 @@ public function compile(Twig_Compiler $compiler)
         ;
     }
 }
+
+class_alias('Twig_Node_Do', 'Twig\Node\DoNode', false);

lib/Twig/Node/Embed.php

@@ -42,3 +42,5 @@ protected function addGetTemplate(Twig_Compiler $compiler)
         ;
     }
 }
+
+class_alias('Twig_Node_Embed', 'Twig\Node\EmbedNode', false);

lib/Twig/Node/Expression.php

@@ -18,3 +18,5 @@
 abstract class Twig_Node_Expression extends Twig_Node
 {
 }
+
+class_alias('Twig_Node_Expression', 'Twig\Node\Expression\AbstractExpression', false);

lib/Twig/Node/Expression/Array.php

@@ -79,3 +79,5 @@ public function compile(Twig_Compiler $compiler)
         $compiler->raw(')');
     }
 }
+
+class_alias('Twig_Node_Expression_Array', 'Twig\Node\Expression\ArrayExpression', false);

lib/Twig/Node/Expression/AssignName.php

@@ -21,3 +21,5 @@ public function compile(Twig_Compiler $compiler)
         ;
     }
 }
+
+class_alias('Twig_Node_Expression_AssignName', 'Twig\Node\Expression\AssignNameExpression', false);

lib/Twig/Node/Expression/Binary.php

@@ -33,3 +33,5 @@ public function compile(Twig_Compiler $compiler)
 
     abstract public function operator(Twig_Compiler $compiler);
 }
+
+class_alias('Twig_Node_Expression_Binary', 'Twig\Node\Expression\Binary\AbstractBinary', false);

lib/Twig/Node/Expression/Binary/Add.php

@@ -16,3 +16,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('+');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Add', 'Twig\Node\Expression\Binary\AddBinary', false);

lib/Twig/Node/Expression/Binary/And.php

@@ -16,3 +16,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('&&');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_And', 'Twig\Node\Expression\Binary\AndBinary', false);

lib/Twig/Node/Expression/Binary/BitwiseAnd.php

@@ -16,3 +16,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('&');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_BitwiseAnd', 'Twig\Node\Expression\Binary\BitwiseAndBinary', false);

lib/Twig/Node/Expression/Binary/BitwiseOr.php

@@ -16,3 +16,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('|');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_BitwiseOr', 'Twig\Node\Expression\Binary\BitwiseOrBinary', false);

lib/Twig/Node/Expression/Binary/BitwiseXor.php

@@ -16,3 +16,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('^');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_BitwiseXor', 'Twig\Node\Expression\Binary\BitwiseXorBinary', false);

lib/Twig/Node/Expression/Binary/Concat.php

@@ -16,3 +16,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('.');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Concat', 'Twig\Node\Expression\Binary\ConcatBinary', false);

lib/Twig/Node/Expression/Binary/Div.php

@@ -16,3 +16,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('/');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Div', 'Twig\Node\Expression\Binary\DivBinary', false);

lib/Twig/Node/Expression/Binary/EndsWith.php

@@ -28,3 +28,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_EndsWith', 'Twig\Node\Expression\Binary\EndsWithBinary', false);

lib/Twig/Node/Expression/Binary/Equal.php

@@ -15,3 +15,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('==');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Equal', 'Twig\Node\Expression\Binary\EqualBinary', false);

lib/Twig/Node/Expression/Binary/FloorDiv.php

@@ -22,3 +22,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('/');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_FloorDiv', 'Twig\Node\Expression\Binary\FloorDivBinary', false);

lib/Twig/Node/Expression/Binary/Greater.php

@@ -15,3 +15,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('>');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Greater', 'Twig\Node\Expression\Binary\GreaterBinary', false);

lib/Twig/Node/Expression/Binary/GreaterEqual.php

@@ -15,3 +15,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('>=');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_GreaterEqual', 'Twig\Node\Expression\Binary\GreaterEqualBinary', false);

lib/Twig/Node/Expression/Binary/In.php

@@ -26,3 +26,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('in');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_In', 'Twig\Node\Expression\Binary\InBinary', false);

lib/Twig/Node/Expression/Binary/Less.php

@@ -15,3 +15,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('<');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Less', 'Twig\Node\Expression\Binary\LessBinary', false);

lib/Twig/Node/Expression/Binary/LessEqual.php

@@ -15,3 +15,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('<=');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_LessEqual', 'Twig\Node\Expression\Binary\LessEqualBinary', false);

lib/Twig/Node/Expression/Binary/Matches.php

@@ -26,3 +26,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Matches', 'Twig\Node\Expression\Binary\MatchesBinary', false);

lib/Twig/Node/Expression/Binary/Mod.php

@@ -16,3 +16,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('%');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Mod', 'Twig\Node\Expression\Binary\ModBinary', false);

lib/Twig/Node/Expression/Binary/Mul.php

@@ -16,3 +16,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('*');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Mul', 'Twig\Node\Expression\Binary\MulBinary', false);

lib/Twig/Node/Expression/Binary/NotEqual.php

@@ -15,3 +15,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('!=');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_NotEqual', 'Twig\Node\Expression\Binary\NotEqualBinary', false);

lib/Twig/Node/Expression/Binary/NotIn.php

@@ -26,3 +26,5 @@ public function operator(Twig_Compiler $compiler)
         return $compiler->raw('not in');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_NotIn', 'Twig\Node\Expression\Binary\NotInBinary', false);