Skip to content

Commit 136da74

Browse files
dgdg
committed
Latte: rewritten Runtime as non-static class
1 parent 473c259 commit 136da74

19 files changed

Lines changed: 215 additions & 196 deletions

‎src/Bridges/FormsLatte/FormsExtension.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ public function getTags(): array
3939
public function getProviders(): array
4040
{
4141
return [
42-
'formsStack' => [],
42+
'forms' => new Runtime,
4343
];
4444
}
4545

4646

4747
public function getCacheKey(Latte\Engine $engine): mixed
4848
{
49-
return 1;
49+
return 2;
5050
}
5151
}

‎src/Bridges/FormsLatte/Nodes/FieldNNameNode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private function init(Tag $tag): void
6565
$elName = strtolower($el->name);
6666

6767
$tag->replaceNAttribute(new AuxiliaryNode(fn(PrintContext $context) => $context->format(
68-
'echo ($ʟ_elem = Nette\Bridges\FormsLatte\Runtime::item(%node, $this->global)'
68+
'echo ($ʟ_elem = $this->global->forms->item(%node)'
6969
. ($elName === 'label' ? '->getLabelPart(%node))' : '->getControlPart(%node))')
7070
. ($usedAttributes ? '->addAttributes(%dump)' : '')
7171
. '->attributes() %3.line;',

‎src/Bridges/FormsLatte/Nodes/FormContainerNode.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ public static function create(Tag $tag): \Generator
4141
public function print(PrintContext $context): string
4242
{
4343
return $context->format(
44-
'$this->global->formsStack[] = $formContainer = Nette\Bridges\FormsLatte\Runtime::item(%node, $this->global) %line; '
45-
. '%node '
46-
. 'array_pop($this->global->formsStack); $formContainer = end($this->global->formsStack);'
47-
. "\n\n",
44+
<<<'XX'
45+
$this->global->forms->begin($formContainer = $this->global->forms->item(%node, Nette\Forms\Container::class)) %line;
46+
%node
47+
$this->global->forms->end(); $formContainer = $this->global->forms->current();
48+
49+
XX,
4850
$this->name,
4951
$this->position,
5052
$this->content,

‎src/Bridges/FormsLatte/Nodes/FormNNameNode.php‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,13 @@ public static function create(Tag $tag): \Generator
4242
public function print(PrintContext $context): string
4343
{
4444
return $context->format(
45-
'$form = $this->global->formsStack[] = '
45+
'$this->global->forms->begin($form = '
4646
. ($this->name instanceof StringNode
4747
? '$this->global->uiControl[%node]'
48-
: 'is_object($ʟ_tmp = %node) ? $ʟ_tmp : $this->global->uiControl[$ʟ_tmp]')
49-
. ' %line;'
50-
. 'Nette\Bridges\FormsLatte\Runtime::initializeForm($form);'
48+
: '(is_object($ʟ_tmp = %node) ? $ʟ_tmp : $this->global->uiControl[$ʟ_tmp])')
49+
. ') %line;'
5150
. '%node '
52-
. 'array_pop($this->global->formsStack);',
51+
. '$this->global->forms->end();',
5352
$this->name,
5453
$this->position,
5554
$this->content,
@@ -62,15 +61,15 @@ private function init(Tag $tag): void
6261
$el = $tag->htmlElement;
6362

6463
$tag->replaceNAttribute(new AuxiliaryNode(fn(PrintContext $context) => $context->format(
65-
'echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), %dump, false) %line;',
64+
'echo $this->global->forms->renderFormBegin(%dump, false) %line;',
6665
array_fill_keys(FieldNNameNode::findUsedAttributes($el), null),
6766
$this->position,
6867
)));
6968

7069
$el->content = new Latte\Compiler\Nodes\FragmentNode([
7170
$el->content,
7271
new AuxiliaryNode(fn(PrintContext $context) => $context->format(
73-
'echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd(end($this->global->formsStack), false) %line;',
72+
'echo $this->global->forms->renderFormEnd(false) %line;',
7473
$this->position,
7574
)),
7675
]);

‎src/Bridges/FormsLatte/Nodes/FormNode.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,20 @@ public static function create(Tag $tag): \Generator
6161
public function print(PrintContext $context): string
6262
{
6363
return $context->format(
64-
'$form = $this->global->formsStack[] = '
64+
'$this->global->forms->begin($form = '
6565
. ($this->name instanceof StringNode
6666
? '$this->global->uiControl[%node]'
67-
: 'is_object($ʟ_tmp = %node) ? $ʟ_tmp : $this->global->uiControl[$ʟ_tmp]')
68-
. ' %line;'
69-
. 'Nette\Bridges\FormsLatte\Runtime::initializeForm($form);'
67+
: '(is_object($ʟ_tmp = %node) ? $ʟ_tmp : $this->global->uiControl[$ʟ_tmp])')
68+
. ') %line;'
7069
. ($this->print
71-
? 'echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form, %node) %1.line;'
70+
? 'echo $this->global->forms->renderFormBegin(%node) %1.line;'
7271
: '')
7372
. ' %3.node '
7473
. ($this->print
75-
? 'echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd(array_pop($this->global->formsStack))'
76-
: 'array_pop($this->global->formsStack)')
77-
. " %4.line;\n\n",
74+
? 'echo $this->global->forms->renderFormEnd() %4.line;'
75+
: '')
76+
. '$this->global->forms->end();'
77+
. "\n\n",
7878
$this->name,
7979
$this->position,
8080
$this->attributes,

‎src/Bridges/FormsLatte/Nodes/FormPrintNode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function print(PrintContext $context): string
4242
'Nette\Forms\Blueprint::%raw('
4343
. ($this->name
4444
? 'is_object($ʟ_tmp = %node) ? $ʟ_tmp : $this->global->uiControl[$ʟ_tmp]'
45-
: 'end($this->global->formsStack)')
45+
: '$this->global->forms->current()')
4646
. ') %2.line; exit;',
4747
$this->mode === 'formPrint' ? 'latte' : 'dataClass',
4848
$this->name,

‎src/Bridges/FormsLatte/Nodes/InputErrorNode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public static function create(Tag $tag): static
3737
public function print(PrintContext $context): string
3838
{
3939
return $context->format(
40-
'echo %escape(Nette\Bridges\FormsLatte\Runtime::item(%node, $this->global)->getError()) %line;',
40+
'echo %escape($this->global->forms->item(%node)->getError()) %line;',
4141
$this->name,
4242
$this->position,
4343
);

‎src/Bridges/FormsLatte/Nodes/InputNode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static function create(Tag $tag): static
4848
public function print(PrintContext $context): string
4949
{
5050
return $context->format(
51-
'echo Nette\Bridges\FormsLatte\Runtime::item(%node, $this->global)->'
51+
'echo $this->global->forms->item(%node)->'
5252
. ($this->part ? ('getControlPart(%node)') : 'getControl()')
5353
. ($this->attributes->items ? '->addAttributes(%2.node)' : '')
5454
. ' %3.line;',

‎src/Bridges/FormsLatte/Nodes/LabelNode.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static function create(Tag $tag): \Generator
6363
public function print(PrintContext $context): string
6464
{
6565
return $context->format(
66-
'echo ($ʟ_label = Nette\Bridges\FormsLatte\Runtime::item(%node, $this->global)->'
66+
'echo ($ʟ_label = $this->global->forms->item(%node)->'
6767
. ($this->part ? 'getLabelPart(%node)' : 'getLabel()')
6868
. ')'
6969
. ($this->attributes->items ? '?->addAttributes(%2.node)' : '')

‎src/Bridges/FormsLatte/Runtime.php‎

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
namespace Nette\Bridges\FormsLatte;
1111

1212
use Nette;
13+
use Nette\Forms\Container;
14+
use Nette\Forms\Control;
1315
use Nette\Forms\Form;
1416
use Nette\Utils\Html;
1517
use function end, explode, is_object, parse_url, preg_replace, preg_split, urldecode;
@@ -22,22 +24,16 @@
2224
*/
2325
class Runtime
2426
{
25-
use Nette\StaticClass;
26-
27-
public static function initializeForm(Form $form): void
28-
{
29-
$form->fireRenderEvents();
30-
foreach ($form->getControls() as $control) {
31-
$control->setOption('rendered', false);
32-
}
33-
}
27+
/** @var Container[] */
28+
private array $stack = [];
3429

3530

3631
/**
3732
* Renders form begin.
3833
*/
39-
public static function renderFormBegin(Form $form, array $attrs, bool $withTags = true): string
34+
public function renderFormBegin(array $attrs, bool $withTags = true): string
4035
{
36+
$form = $this->current();
4137
$el = $form->getElementPrototype();
4238
$el->action = (string) $el->action;
4339
$el = clone $el;
@@ -53,8 +49,9 @@ public static function renderFormBegin(Form $form, array $attrs, bool $withTags
5349
/**
5450
* Renders form end.
5551
*/
56-
public static function renderFormEnd(Form $form, bool $withTags = true): string
52+
public function renderFormEnd(bool $withTags = true): string
5753
{
54+
$form = $this->current();
5855
$s = '';
5956
if ($form->isMethod('get')) {
6057
foreach (preg_split('#[;&]#', (string) parse_url($form->getElementPrototype()->action, PHP_URL_QUERY), -1, PREG_SPLIT_NO_EMPTY) as $param) {
@@ -77,12 +74,37 @@ public static function renderFormEnd(Form $form, bool $withTags = true): string
7774
}
7875

7976

80-
public static function item($item, $global): object
77+
public function item(mixed $item, string $type = Control::class): Control|Container
78+
{
79+
$item = is_object($item) ? $item : $this->current()[$item];
80+
if (!$item instanceof $type) {
81+
throw new Nette\InvalidArgumentException("Expected instance of $type, " . get_debug_type($item) . ' given.');
82+
}
83+
return $item;
84+
}
85+
86+
87+
public function begin(Container $form): void
8188
{
82-
if (is_object($item)) {
83-
return $item;
89+
$this->stack[] = $form;
90+
91+
if ($form instanceof Form) {
92+
$form->fireRenderEvents();
93+
foreach ($form->getControls() as $control) {
94+
$control->setOption('rendered', false);
95+
}
8496
}
85-
$form = end($global->formsStack) ?: throw new \LogicException('Form declaration is missing, did you use {form} or <form n:name> tag?');
86-
return $form[$item];
97+
}
98+
99+
100+
public function end(): void
101+
{
102+
array_pop($this->stack);
103+
}
104+
105+
106+
public function current(): Container
107+
{
108+
return end($this->stack) ?: throw new Nette\InvalidStateException('Form declaration is missing, did you use {form} or <form n:name> tag?');
87109
}
88110
}

0 commit comments

Comments
 (0)