Fix #1751 add context in class CompilerFileAnonymous

zephir-lang · Feb 21, 2019 · cf3c72e · cf3c72e
1 parent e1004e8
commit cf3c72e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/Library/CompilerFileAnonymous.php b/Library/CompilerFileAnonymous.php
@@ -25,6 +25,9 @@ final class CompilerFileAnonymous implements FileInterface
 {
     use LoggerAwareTrait;
 
+    /** @var CompilationContext */
+    protected $context;
+
     /** @var string */
     protected $namespace;
 
@@ -48,10 +51,11 @@ final class CompilerFileAnonymous implements FileInterface
      * @param ClassDefinition $classDefinition
      * @param Config          $config
      */
-    public function __construct(ClassDefinition $classDefinition, Config $config)
+    public function __construct(ClassDefinition $classDefinition, Config $config, CompilationContext $context)
     {
         $this->classDefinition = $classDefinition;
         $this->config = $config;
+        $this->context = $context;
         $this->logger = new NullLogger();
     }
 
@@ -152,6 +156,12 @@ public function compile(Compiler $compiler, StringsManager $stringsManager)
          */
         $compilationContext = new CompilationContext();
 
+        if ($this->context) {
+            $compilationContext->aliasManager = $this->context->aliasManager;
+        } else {
+            $compilationContext->aliasManager = new AliasManager();
+        }
+
         /*
          * Set global compiler in the compilation context
          */
@@ -186,11 +196,6 @@ public function compile(Compiler $compiler, StringsManager $stringsManager)
         $codePrinter = new CodePrinter();
         $compilationContext->codePrinter = $codePrinter;
 
-        /*
-         * Alias manager
-         */
-        $compilationContext->aliasManager = new AliasManager();
-
         $codePrinter->outputBlankLine();
 
         $this->compileClass($compilationContext);

diff --git a/Library/Expression/Closure.php b/Library/Expression/Closure.php
@@ -90,7 +90,7 @@ public function compile(array $expression, CompilationContext $compilationContex
 
         $classDefinition->setIsFinal(true);
 
-        $compilerFile = new CompilerFileAnonymous($classDefinition, $compilationContext->config);
+        $compilerFile = new CompilerFileAnonymous($classDefinition, $compilationContext->config, $compilationContext);
         $compilerFile->setLogger($compilationContext->logger);
 
         $compilationContext->compiler->addClassDefinition($compilerFile, $classDefinition);