Skip to content

Commit 32c2b8c

Browse files
dgdg
committed
FormMacros: removed deprecated $_form
1 parent 44f9ade commit 32c2b8c

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

‎src/Bridges/FormsLatte/FormMacros.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static function install(Latte\Compiler $compiler): void
3333
$me = new static($compiler);
3434
$me->addMacro('form', [$me, 'macroForm'], 'echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd(array_pop($this->global->formsStack));');
3535
$me->addMacro('formContext', [$me, 'macroFormContext'], 'array_pop($this->global->formsStack);');
36-
$me->addMacro('formContainer', [$me, 'macroFormContainer'], 'array_pop($this->global->formsStack); $formContainer = $_form = end($this->global->formsStack)');
36+
$me->addMacro('formContainer', [$me, 'macroFormContainer'], 'array_pop($this->global->formsStack); $formContainer = end($this->global->formsStack)');
3737
$me->addMacro('label', [$me, 'macroLabel'], [$me, 'macroLabelEnd'], null, self::AUTO_EMPTY);
3838
$me->addMacro('input', [$me, 'macroInput']);
3939
$me->addMacro('name', [$me, 'macroName'], [$me, 'macroNameEnd'], [$me, 'macroNameAttr']);
@@ -64,7 +64,7 @@ public function macroForm(MacroNode $node, PhpWriter $writer)
6464
$node->tokenizer->reset();
6565
return $writer->write(
6666
"/* line $node->startLine */\n"
67-
. 'echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = '
67+
. 'echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $this->global->formsStack[] = '
6868
. ($name[0] === '$' ? 'is_object(%node.word) ? %node.word : ' : '')
6969
. '$this->global->uiControl[%node.word], %node.array);'
7070
);
@@ -109,7 +109,7 @@ public function macroFormContainer(MacroNode $node, PhpWriter $writer)
109109
}
110110
$node->tokenizer->reset();
111111
return $writer->write(
112-
'$this->global->formsStack[] = $formContainer = $_form = '
112+
'$this->global->formsStack[] = $formContainer = '
113113
. ($name[0] === '$' ? 'is_object(%node.word) ? %node.word : ' : '')
114114
. 'end($this->global->formsStack)[%node.word];'
115115
);
@@ -197,7 +197,7 @@ public function macroNameAttr(MacroNode $node, PhpWriter $writer)
197197

198198
if ($tagName === 'form') {
199199
$node->openingCode = $writer->write(
200-
'<?php $form = $_form = $this->global->formsStack[] = '
200+
'<?php $form = $this->global->formsStack[] = '
201201
. ($name[0] === '$' ? 'is_object(%0.word) ? %0.word : ' : '')
202202
. '$this->global->uiControl[%0.word]; ?>',
203203
$name

‎tests/Forms.Latte/expected/FormMacros.button.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
%A%
3-
$form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
3+
$form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
44
echo '<form';
55
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), [], false);
66
echo '>

‎tests/Forms.Latte/expected/FormMacros.formContainer.phtml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
%A%
33
/* line 1 */
4-
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"], []);
4+
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $this->global->formsStack[] = $this->global->uiControl["myForm"], []);
55
echo '
66
<table>
77
<tr>
@@ -13,7 +13,7 @@
1313
echo '</td>
1414
</tr>
1515
';
16-
$this->global->formsStack[] = $formContainer = $_form = end($this->global->formsStack)["cont1"];
16+
$this->global->formsStack[] = $formContainer = end($this->global->formsStack)["cont1"];
1717
echo ' <tr>
1818
<th>';
1919
if ($_label = end($this->global->formsStack)["input2"]->getLabel()) echo $_label;
@@ -34,7 +34,7 @@
3434
<th>Checkboxes</th>
3535
<td>
3636
';
37-
$this->global->formsStack[] = $formContainer = $_form = end($this->global->formsStack)["cont2"];
37+
$this->global->formsStack[] = $formContainer = end($this->global->formsStack)["cont2"];
3838
echo ' <ol>
3939
';
4040
$iterations = 0;
@@ -49,7 +49,7 @@
4949
echo ' </ol>
5050
';
5151
array_pop($this->global->formsStack);
52-
$formContainer = $_form = end($this->global->formsStack);
52+
$formContainer = end($this->global->formsStack);
5353
echo ' </td>
5454
</tr>
5555
<tr>
@@ -62,8 +62,8 @@
6262
</tr>
6363
';
6464
array_pop($this->global->formsStack);
65-
$formContainer = $_form = end($this->global->formsStack);
66-
$this->global->formsStack[] = $formContainer = $_form = end($this->global->formsStack)["items"];
65+
$formContainer = end($this->global->formsStack);
66+
$this->global->formsStack[] = $formContainer = end($this->global->formsStack)["items"];
6767
echo ' <tr>
6868
<th>Items</th>
6969
<td>
@@ -72,19 +72,19 @@
7272
$iterations = 0;
7373
foreach ($items as $item) {
7474
if (!isset($formContainer[$item])) continue;
75-
$this->global->formsStack[] = $formContainer = $_form = is_object($item) ? $item : end($this->global->formsStack)[$item];
75+
$this->global->formsStack[] = $formContainer = is_object($item) ? $item : end($this->global->formsStack)[$item];
7676
echo ' ';
7777
echo end($this->global->formsStack)["input"]->getControl() /* line 37 */;
7878
echo "\n";
7979
array_pop($this->global->formsStack);
80-
$formContainer = $_form = end($this->global->formsStack);
80+
$formContainer = end($this->global->formsStack);
8181
$iterations++;
8282
}
8383
echo ' </td>
8484
</tr>
8585
';
8686
array_pop($this->global->formsStack);
87-
$formContainer = $_form = end($this->global->formsStack);
87+
$formContainer = end($this->global->formsStack);
8888
echo ' <tr>
8989
<th>';
9090
if ($_label = end($this->global->formsStack)["input8"]->getLabel()) echo $_label;

‎tests/Forms.Latte/expected/FormMacros.forms.phtml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22
%A%
3-
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"], ['id' => 'myForm', 'class'=>"ajax"]);
3+
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $this->global->formsStack[] = $this->global->uiControl["myForm"], ['id' => 'myForm', 'class'=>"ajax"]);
44
echo "\n";
55
$iterations = 0;
66
foreach (['id', 'username', 'select', 'area', 'send'] as $name) {
@@ -77,13 +77,13 @@
7777
7878
';
7979
/* line 27 */
80-
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"], []);
80+
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $this->global->formsStack[] = $this->global->uiControl["myForm"], []);
8181
echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd(array_pop($this->global->formsStack));
8282
echo '
8383
8484
';
8585
/* line 29 */
86-
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"], []);
86+
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $this->global->formsStack[] = $this->global->uiControl["myForm"], []);
8787
echo "\n";
8888
$iterations = 0;
8989
foreach ($form['sex']->items as $key => $label) {
@@ -198,7 +198,7 @@
198198
199199
200200
';
201-
$form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
201+
$form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
202202
if (1) {
203203
echo '<form id="myForm" class="ajax"';
204204
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), ['id' => null, 'class' => null], false);
@@ -215,7 +215,7 @@
215215
echo '
216216
217217
';
218-
$form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
218+
$form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
219219
echo '<form';
220220
echo ($ʟ_tmp = array_filter(['nclass'])) ? ' class="' . LR\Filters::escapeHtmlAttr(implode(" ", array_unique($ʟ_tmp))) . '"' : "";
221221
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), ['class' => null], false);
@@ -231,7 +231,7 @@
231231
232232
233233
';
234-
$form = $_form = $this->global->formsStack[] = is_object($this->global->uiControl['myForm']) ? $this->global->uiControl['myForm'] : $this->global->uiControl[$this->global->uiControl['myForm']];
234+
$form = $this->global->formsStack[] = is_object($this->global->uiControl['myForm']) ? $this->global->uiControl['myForm'] : $this->global->uiControl[$this->global->uiControl['myForm']];
235235
echo '<FORM';
236236
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), [], false);
237237
echo '>

‎tests/Forms.Latte/expected/FormMacros.get.phtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22
%A%
3-
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"], []);
3+
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $this->global->formsStack[] = $this->global->uiControl["myForm"], []);
44
echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd(array_pop($this->global->formsStack));
55
echo '
66
77
';
8-
$form = $_form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
8+
$form = $this->global->formsStack[] = $this->global->uiControl["myForm"];
99
echo '<form';
1010
echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), [], false);
1111
echo '>

0 commit comments

Comments
 (0)