Compiler: refactor to use getStoreEnv() method

robocoder · robocoder · commit 59112355fa98 · 2015-10-30T14:32:45.000-04:00
diff --git a/src/Compiler.php b/src/Compiler.php
@@ -1600,14 +1600,14 @@ protected function compileChild($child, $out)
                     $this->throwError("Undefined mixin $name");
                 }
 
-                $callingScope = $this->env;
+                $callingScope = $this->getStoreEnv();
 
                 // push scope, apply args
                 $this->pushEnv();
                 $this->env->depth--;
 
                 if (isset($content)) {
-                    $content->scope = $this->storeEnv ? $this->storeEnv : $callingScope;
+                    $content->scope = $callingScope;
 
                     $this->setRaw(self::$namespaces['special'] . 'content', $content, $this->getStoreEnv());
                 }

Original file line number	Diff line number	Diff line change
`@@ -1600,14 +1600,14 @@ protected function compileChild($child, $out)`
`1600`	`1600`	`$this->throwError("Undefined mixin $name");`
`1601`	`1601`	`}`
`1602`	`1602`
`1603`		`- $callingScope = $this->env;`
	`1603`	`+ $callingScope = $this->getStoreEnv();`
`1604`	`1604`
`1605`	`1605`	`// push scope, apply args`
`1606`	`1606`	`$this->pushEnv();`
`1607`	`1607`	`$this->env->depth--;`
`1608`	`1608`
`1609`	`1609`	`if (isset($content)) {`
`1610`		`- $content->scope = $this->storeEnv ? $this->storeEnv : $callingScope;`
	`1610`	`+ $content->scope = $callingScope;`
`1611`	`1611`
`1612`	`1612`	`$this->setRaw(self::$namespaces['special'] . 'content', $content, $this->getStoreEnv());`
`1613`	`1613`	`}`