Compare commits

..

No commits in common. "ded3d5e9076ca946f199b07731060308fb50d060" and "84020a871c301314021d46a8c05c92b537e8056a" have entirely different histories.

3 changed files with 5 additions and 13 deletions

View File

@ -7,7 +7,7 @@ It also insert `Tell` inside the LanguageHandler which handles the `{% _ 'relati
```php
use function DI\autowire, DI\create, DI\get;
use Laminas\Diactoros\Response\HtmlResponse;
use Zend\Diactoros\Response\HtmlResponse;
use Picea\{ Picea, Caching\Cache, Caching\Opcache, Compiler, Compiler\Context, Compiler\BaseContext, FileFetcher, Language\DefaultRegistrations, Method\Request };
use Picea\Extension\{ LanguageHandler, LanguageExtension, TitleExtension, MoneyExtension, UrlExtension };

View File

@ -14,8 +14,6 @@ abstract class Context {
public string $compiledSource = "";
public ? string $sectionAction = null;
public string $viewPath = "";
public string $filePath = "";

View File

@ -4,17 +4,13 @@ namespace Picea\ControlStructure;
class SectionToken implements ControlStructure {
public array $token = [ "section", "section.prepend", "section.append", "endsection" ];
public array $token = [ "section", "endsection" ];
public function parse(\Picea\Compiler\Context &$context, ?string $arguments, string $token) {
switch($token) {
case "section.prepend":
$context->sectionAction = "prepend";
case "section.append":
$context->sectionAction ??= "append";
case "section":
return $this->printSection($context, $arguments);
case "endsection":
if ( empty($context->sections) ) {
throw new \RuntimeException("A section closing tag {% endsection %} was found without an opening {% section %} tag");
@ -32,7 +28,7 @@ class SectionToken implements ControlStructure {
$options = eval("return $options;");
}
if ( ! ctype_alnum(str_replace([".", "\"", "'", "-", "_", ":"], "", $name)) ) {
if ( ! ctype_alnum(str_replace([".", "\"", "'", "-", "_"], "", $name)) ) {
throw new \RuntimeException("Your section named `{$name}` contains invalid character. Allowed are only letters, numbers, dashes, underscores and dots");
}
@ -41,9 +37,7 @@ class SectionToken implements ControlStructure {
'options' => $options,
];
$action = $options['action'] ?? $context->sectionAction ?? "default";
unset($context->sectionAction);
$action = $options['action'] ?? "default";
if (! in_array($action, ['prepend', 'append', 'default'])) {
throw new \RuntimeException("An unsupported action `$action` was given as an option of a {% section %} tag");