Fix typo in "deprecated"

.github/workflows/static-analysis.yml

@@ -10,7 +10,7 @@ jobs:
             - uses: actions/checkout@v3
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.4
+                  php-version: 8.0
                   coverage: none
 
             - run: composer install --no-progress --prefer-dist

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
+                php: ['8.0', '8.1', '8.2', '8.3']
 
             fail-fast: false
 
@@ -35,7 +35,7 @@ jobs:
             - uses: actions/checkout@v3
             - uses: shivammathur/setup-php@v2
               with:
-                  php-version: 7.2
+                  php-version: 8.0
                   coverage: none
 
             - run: composer update --no-progress --prefer-dist --prefer-lowest --prefer-stable

composer.json

@@ -15,15 +15,15 @@
 		}
 	],
 	"require": {
-		"php": "7.2 - 8.3",
-		"nette/component-model": "^3.0",
-		"nette/http": "^3.1",
-		"nette/utils": "^3.2.5 || ~4.0.0"
+		"php": "8.0 - 8.3",
+		"nette/component-model": "^4.0",
+		"nette/http": "^4.0",
+		"nette/utils": "^4.0"
 	},
 	"require-dev": {
-		"nette/application": "^3.0",
-		"nette/di": "^3.0",
-		"nette/tester": "^2.4",
+		"nette/application": "^4.0",
+		"nette/di": "^3.1 || ^4.0",
+		"nette/tester": "^2.5",
 		"latte/latte": "^2.10.2 || ^3.0.3",
 		"tracy/tracy": "^2.9",
 		"phpstan/phpstan-nette": "^1"
@@ -41,7 +41,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.1-dev"
+			"dev-master": "4.0-dev"
 		}
 	}
 }

examples/custom-control.php

@@ -18,12 +18,11 @@
 
 class DateInput extends Nette\Forms\Controls\BaseControl
 {
-	/** @var string */
-	private $day = '';
+	private string $day = '';
 
-	private $month = '';
+	private string $month = '';
 
-	private $year = '';
+	private string $year = '';
 
 
 	public function __construct($label = null)
@@ -88,7 +87,7 @@ public function getControl()
 			. Helpers::createSelectBox(
 				[1 => 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
 				[],
-				$this->month
+				$this->month,
 			)->name($name . '[month]')
 
 			. Html::el('input', [

readme.md

@@ -44,7 +44,7 @@ The recommended way to install is via Composer:
 composer require nette/forms
 ```
 
-It requires PHP version 7.2 and supports PHP up to 8.3.
+It requires PHP version 8.0 and supports PHP up to 8.3.
 
 
 Client-side support can be installed with npm or yarn:

src/Bridges/FormsDI/FormsExtension.php

@@ -21,7 +21,7 @@
 	{
 		$this->config = new class {
 			/** @var string[] */
-			public $messages = [];
+			public array $messages = [];
 		};
 	}
 
@@ -30,7 +30,7 @@
 	{
 		$initialize = $this->initialization ?? $class->getMethod('initialize');
 
 		foreach ($this->config->messages as $name => $text) {
 			if (defined('Nette\Forms\Form::' . $name)) {
 				$initialize->addBody('Nette\Forms\Validator::$messages[Nette\Forms\Form::?] = ?;', [$name, $text]);
 			} elseif (defined($name)) {

src/Bridges/FormsLatte/FormMacros.php

@@ -26,16 +26,16 @@
  * - {formContainer name} ... {/formContainer}
  * - {formContext name} ... {/formContext}
  */
 final class FormMacros extends MacroSet
 {
 	public static function install(Latte\Compiler $compiler): void
 	{
 		$me = new static($compiler);
-		$me->addMacro('form', [$me, 'macroForm'], 'echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd(array_pop($this->global->formsStack));');
+		$me->addMacro('form', [$me, 'macroForm'], 'echo Nette\Bridges\FormsLatte\Runtime2::renderFormEnd(array_pop($this->global->formsStack));');
 		$me->addMacro('formContext', [$me, 'macroFormContext'], 'array_pop($this->global->formsStack);');
 		$me->addMacro('formContainer', [$me, 'macroFormContainer'], 'array_pop($this->global->formsStack); $formContainer = end($this->global->formsStack)');
 		$me->addMacro('label', [$me, 'macroLabel'], [$me, 'macroLabelEnd'], null, self::AUTO_EMPTY);
 		$me->addMacro('input', [$me, 'macroInput']);
 		$me->addMacro('name', [$me, 'macroName'], [$me, 'macroNameEnd'], [$me, 'macroNameAttr']);
 		$me->addMacro('inputError', [$me, 'macroInputError']);
 		$me->addMacro('formPrint', [$me, 'macroFormPrint']);
@@ -67,12 +67,12 @@
 		$node->replaced = true;
 		$node->tokenizer->reset();
 		return $writer->write(
-			'echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin($form = $this->global->formsStack[] = '
+			'echo Nette\Bridges\FormsLatte\Runtime2::renderFormBegin($form = $this->global->formsStack[] = '
 			. ($name[0] === '$'
 				? 'is_object($ʟ_tmp = %node.word) ? $ʟ_tmp : $this->global->uiControl[$ʟ_tmp]'
 				: '$this->global->uiControl[%node.word]')
 			. ', %node.array)'
-			. " /* line $node->startLine */;"
+			. " /* line $node->startLine */;",
 		);
 	}
 
@@ -101,7 +101,7 @@
 			. ($name[0] === '$'
 				? 'is_object($ʟ_tmp = %node.word) ? $ʟ_tmp : $this->global->uiControl[$ʟ_tmp]'
 				: '$this->global->uiControl[%node.word]')
-			. " /* line $node->startLine */;"
+			. " /* line $node->startLine */;",
 		);
 	}
 
@@ -126,7 +126,7 @@
 			. ($name[0] === '$'
 				? 'is_object($ʟ_tmp = %node.word) ? $ʟ_tmp : end($this->global->formsStack)[$ʟ_tmp]'
 				: 'end($this->global->formsStack)[%node.word]')
-			. " /* line $node->startLine */;"
+			. " /* line $node->startLine */;",
 		);
 	}
 
@@ -155,7 +155,7 @@
 			. '->%1.raw) echo $ʟ_label'
 			. ($node->tokenizer->isNext() ? '->addAttributes(%node.array)' : ''),
 			$name,
-			$words ? ('getLabelPart(' . implode(', ', array_map([$writer, 'formatWord'], $words)) . ')') : 'getLabel()'
+			$words ? ('getLabelPart(' . implode(', ', array_map([$writer, 'formatWord'], $words)) . ')') : 'getLabel()',
 		);
 	}
 
@@ -196,7 +196,7 @@
 			. ($node->tokenizer->isNext() ? '->addAttributes(%node.array)' : '')
 			. " /* line $node->startLine */;",
 			$name,
-			$words ? 'getControlPart(' . implode(', ', array_map([$writer, 'formatWord'], $words)) . ')' : 'getControl()'
+			$words ? 'getControlPart(' . implode(', ', array_map([$writer, 'formatWord'], $words)) . ')' : 'getControl()',
 		);
 	}
 
@@ -227,11 +227,11 @@
 					? 'is_object($ʟ_tmp = %0.word) ? $ʟ_tmp : $this->global->uiControl[$ʟ_tmp]'
 					: '$this->global->uiControl[%0.word]')
 				. " /* line $node->startLine */; ?>",
-				$name
+				$name,
 			);
 			return $writer->write(
-				'echo Nette\Bridges\FormsLatte\Runtime::renderFormBegin(end($this->global->formsStack), %0.var, false)',
-				array_fill_keys($definedHtmlAttributes, null)
+				'echo Nette\Bridges\FormsLatte\Runtime2::renderFormBegin(end($this->global->formsStack), %0.var, false)',
+				array_fill_keys($definedHtmlAttributes, null),
 			);
 		} else {
 			$method = $tagName === 'label' ? 'getLabel' : 'getControl';
@@ -245,7 +245,7 @@
 				. " /* line $node->startLine */;",
 				$name,
 				$method . 'Part(' . implode(', ', array_map([$writer, 'formatWord'], $words)) . ')',
-				array_fill_keys($definedHtmlAttributes, null)
+				array_fill_keys($definedHtmlAttributes, null),
 			);
 		}
 	}
@@ -265,7 +265,7 @@
 	{
 		$tagName = strtolower($node->htmlNode->name);
 		if ($tagName === 'form') {
-			$node->innerContent .= '<?php echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd(array_pop($this->global->formsStack), false)'
+			$node->innerContent .= '<?php echo Nette\Bridges\FormsLatte\Runtime2::renderFormEnd(array_pop($this->global->formsStack), false)'
 				. " /* line $node->startLine */; ?>";
 		} elseif ($tagName === 'label') {
 			if ($node->htmlNode->empty) {
@@ -298,7 +298,7 @@
 			return $writer->write(
 				'$ʟ_input = is_object($ʟ_tmp = %0.word) ? $ʟ_tmp : end($this->global->formsStack)[$ʟ_tmp];'
 				. "echo %escape(\$ʟ_input->getError()) /* line $node->startLine */;",
-				$name
+				$name,
 			);
 		} else {
 			return $writer->write("echo %escape(end(\$this->global->formsStack)[%0.word]->getError()) /* line $node->startLine */;", $name);
@@ -319,11 +319,9 @@
 
 		$node->tokenizer->reset();
 		return $writer->write(
-			'Nette\Bridges\FormsLatte\Runtime::render' . $node->name . '('
-			. ($name[0] === '$'
-				? 'is_object($ʟ_tmp = %node.word) ? $ʟ_tmp : $this->global->uiControl[$ʟ_tmp]'
-				: '$this->global->uiControl[%node.word]')
-			. '); exit;'
+			'Nette\Bridges\FormsLatte\Runtime2::render' . $node->name . '('
+			. ($name[0] === '$' ? 'is_object(%node.word) ? %node.word : ' : '')
+			. '$this->global->uiControl[%node.word]); exit;',
 		);
 	}
 }

src/Bridges/FormsLatte/FormsExtension.php

@@ -38,7 +38,13 @@ public function getTags(): array
 	public function getProviders(): array
 	{
 		return [
-			'formsStack' => [],
+			'forms' => new Runtime,
 		];
 	}
+
+
+	public function getCacheKey(Latte\Engine $engine): array
+	{
+		return ['version' => 2];
+	}
 }

src/Bridges/FormsLatte/Nodes/FieldNNameNode.php

@@ -64,7 +64,7 @@ private function init(Tag $tag)
 		$elName = strtolower($el->name);
 
 		$tag->replaceNAttribute(new AuxiliaryNode(fn(PrintContext $context) => $context->format(
-			'echo ($ʟ_input = Nette\Bridges\FormsLatte\Runtime::item(%node, $this->global))'
+			'echo ($ʟ_input = $this->global->forms->item(%node))'
 			. ($elName === 'label' ? '->getLabelPart(%node)' : '->getControlPart(%node)')
 			. ($usedAttributes ? '->addAttributes(%dump)' : '')
 			. '->attributes() %3.line;',

src/Bridges/FormsLatte/Nodes/FormContainerNode.php

@@ -41,9 +41,9 @@ public static function create(Tag $tag): \Generator
 	public function print(PrintContext $context): string
 	{
 		return $context->format(
-			'$this->global->formsStack[] = $formContainer = Nette\Bridges\FormsLatte\Runtime::item(%node, $this->global) %line; '
+			'$this->global->forms->begin($formContainer = $this->global->forms->item(%node)) %line; '
 			. '%node '
-			. 'array_pop($this->global->formsStack); $formContainer = end($this->global->formsStack);'
+			. '$this->global->forms->end(); $formContainer = $this->global->forms->current();'
 			. "\n\n",
 			$this->name,
 			$this->position,