mcndave
/
picea
1
1
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases Wiki Activity

- Fixed ViewToken and BlockToken inline vars

This commit is contained in:
Dave Mc Nicoll 2020-11-27 11:32:01 -05:00
parent 082bdd4ad3
commit 82eca2e520
7 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Builder.php
View File

@ -15,15 +15,17 @@ class Builder
public function build(Compiler\Context &$context, string $compiledSource) : Compiler\Context
{
$path = fn($p) => addslashes(str_replace('/', DIRECTORY_SEPARATOR, $p));
$context->className = static::generateClassName($context->viewPath);
$replace = [
'%NAMESPACE%' => $context->namespace,
'%USE%' => ( $uses = $context->renderUses() ) ? "use $uses;" : false,
'%CLASSNAME%' => $context->className,
'%PATHNAME%' => $context->viewPath,
'%FULLPATH%' => $context->filePath,
'%TEMPLATE%' => $this->templatePath,
'%PATHNAME%' => $path($context->viewPath),
'%FULLPATH%' => $path($context->filePath),
'%TEMPLATE%' => $path($this->templatePath),
'%EXTENDS%' => $context->extendFrom ? "extends " . static::TEMPLATE_CLASSNAME_PREFIX . static::generateClassUID($context->extendFrom) : '',
'%EXTENDS_TEMPLATE%' => $context->extendFrom,
'%CONTENT%' => $compiledSource,

2
src/Builder/ClassTemplate.php
View File

@ -67,7 +67,7 @@ if (! class_exists("%NAMESPACE%\%CLASSNAME%", false) ) {
$sourceFile = file_get_contents("%TEMPLATE%");
if ( $sourceFile ) {
foreach(explode(PHP_EOL, $sourceFile) as $line => $content) {
foreach(explode("\n", $sourceFile) as $line => $content) {
if ( strpos($content, str_replace('$', '%', '$CONTENT$')) !== false ) {
return $sourceLine - $line;
}

2
src/Compiler/Context.php
View File

@ -15,6 +15,8 @@ abstract class Context {
public string $compiledSource = "";
public string $viewPath = "";
public string $filePath = "";
public array $switchStack = [];

18
src/ControlStructure/BlockToken.php
View File

@ -55,13 +55,21 @@ class BlockToken implements ControlStructure {
$definition = $def->printDefinition($slotName);
if ($definition) {
$definition .= ",";
}
return <<<PHP
<?php \$this->printSlot($name, function($definition, array \$___using = []) { extract(\$___using, \EXTR_SKIP); ?>
<?php \$this->printSlot($name, function($definition array \$___using = []) use (\$picea) { extract(\$___using, \EXTR_SKIP); ?>
PHP;
}
else {
if ($definition) {
$definition .= ",";
}
return <<<PHP
<?php \$___block->slotIsSet($name) || \$___block->setSlot($name, function($definition, array \$___using = []) { extract(\$___using, \EXTR_SKIP); ?>
<?php \$___block->slotIsSet($name) || \$___block->setSlot($name, function($definition array \$___using = []) use (\$picea) { extract(\$___using, \EXTR_SKIP); ?>
PHP;
}
@ -72,11 +80,11 @@ class BlockToken implements ControlStructure {
$definition = $def->getCurrentSlotDefinitionVars();
if ($definition) {
$definition = "$definition,";
$definition .= ",";
}
return <<<PHP
<?php })->call(\$this, $definition \$this->using); ?>
<?php })->call(\$this, $definition array_merge(get_defined_vars(), \$this->using)); ?>
PHP;
}
else {
@ -207,7 +215,7 @@ class BlockToken implements ControlStructure {
{
$this->rendering = true;
return $classTemplate->picea->inlineHtml($this, $this->viewPath, ...$this->arguments);
return $classTemplate->picea->inlineBlock($this, $this->viewPath, ...$this->arguments);
}
public function setSlot(string $name, Callable $method) : void

3
src/ControlStructure/ViewToken.php
View File

@ -7,6 +7,7 @@ class ViewToken implements ControlStructure {
public string $token = "view";
public function parse(/*\Picae\Compiler\Context*/ &$context, ?string $arguments, string $token) {
return "<?php echo \$___class__template->picea->renderHtml($arguments, get_defined_vars(), \$this); ?>";
# The way this is ordered, if you provide a second arguments, being an array of variables, get_defined_vars() will not be pushed inside the view
return "<?php echo \$___class__template->picea->inlineHtml(\$this, $arguments, get_defined_vars()); ?>";
}
}

4
src/Extension/TitleExtension.php
View File

@ -23,7 +23,7 @@ class TitleExtension implements Extension {
return "<?php echo title($arguments) ?>";
}
public function handleTitle(? string $set = null) : ? string
public function handleTitle(? string $set = null, ...$arguments) : ? string
{
if ( $set === null ) {
return $this->title;
@ -31,7 +31,7 @@ class TitleExtension implements Extension {
else {
# Fixed a bug where template inheritance was rewriting title
if ( empty($this->title) ) {
$this->title = $set;
$this->title = $arguments ? sprintf($set, ...$arguments) : $set;
}
}

39
src/Picea.php
View File

@ -64,6 +64,7 @@ class Picea implements LanguageRegistration
}
catch(\Throwable $ex) {
# Temporary class for an experiment
throw $ex;
throw new class($object, $this, "An error occurred trying to render HTML view `$viewPath` : " . $ex->getMessage(), 911, $ex) extends \Exception {
protected Picea $picea;
@ -75,30 +76,25 @@ class Picea implements LanguageRegistration
$this->picea = $picea;
# $template = $this->getTemplateFile( $previous->getFile() );
$this->fromPrevious($previous, $compiledObject);
$this->defineError($previous, $compiledObject);
}
protected function fromPrevious(\Throwable $previous, object $compiledObject) : void
protected function defineError(\Throwable $previous, object $compiledObject) : void
{
$loadedTemplates = array_flip($this->picea->loadedTemplateFile);
foreach($previous->getTrace() as $trace) {
if ( isset($trace['file'], $loadedTemplates[$trace['file']]) ) {
$class = $loadedTemplates[ $trace['file'] ];
$content = include($trace['file']);
$this->file = $content['view'];
$this->line = $compiledObject->getSourceLineFromException($trace['line']);
$this->line = $class::getSourceLineFromException($trace['line']);
return;
}
}
#if ( $template ) {
# $this->redefineErrorState($classContent);
#}
}
protected function getTemplateFile(string $filePath) : ? array
@ -123,10 +119,14 @@ class Picea implements LanguageRegistration
* @param array $variables
* @return type
*/
public function inlineHtml(? object $proxy, string $viewPath, ... $variables) {
return $this->renderHtml($viewPath, [ 'inlineVariables' => $variables ], $proxy);
public function inlineHtml(? object $proxy, string $viewPath, array $variables) {
return $this->renderHtml($viewPath, $variables, $proxy);
}
public function inlineBlock(? object $proxy, string $viewPath, ... $variables) {
return $this->renderHtml($viewPath, [ 'inlineVariables' => $variables ], $proxy);
}
public function inlineContent(string $viewPath) {
return $this->fileFetcher->getFileContent($viewPath);
}
@ -140,21 +140,6 @@ class Picea implements LanguageRegistration
return $object;
}
#public function outputHtml(string $viewPath, array $variables) : ResponseInterface
#{
# if ( $this->response ?? false ) {
# if ( false === $content = $this->cache->handle($viewPath) ) {
#
# }
# $source = $this->compileSource($source ?? "test");
# $response = $this->response;
# return $response("abc");
# }
# throw new \InvalidArgumentException("No \Psr\Http\Message\ResponseInterface closure provided. Please provide one using the constructor or assigning it to the class variable `responseHtml`.");
#}
public function compileSource(string $source) : array
{
$this->compiler->loadSourceCode($source);