Add BackedEnum support for ChoiceControl, MultiChoiceControl, HiddenF…

.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']
+                php: ['8.0', '8.1', '8.2']
 
             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,14 +15,14 @@
 		}
 	],
 	"require": {
-		"php": ">=7.2 <8.3",
-		"nette/component-model": "^3.0",
-		"nette/http": "^3.1",
-		"nette/utils": "^3.2.1"
+		"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/application": "^4.0",
+		"nette/di": "^4.0",
 		"nette/tester": "^2.4",
 		"latte/latte": "^2.10.2 || ^3.0.3",
 		"tracy/tracy": "^2.9",
@@ -41,7 +41,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.1-dev"
+			"dev-master": "4.0-dev"
 		}
 	}
 }

examples/basic-example.php

@@ -30,8 +30,8 @@
 
 $form->addText('age', 'Your age:')
 	->setRequired('Enter your age')
-	->addRule($form::INTEGER, 'Age must be numeric value')
-	->addRule($form::RANGE, 'Age must be in range from %d to %d', [10, 100]);
+	->addRule($form::Integer, 'Age must be numeric value')
+	->addRule($form::Range, 'Age must be in range from %d to %d', [10, 100]);
 
 $form->addRadioList('gender', 'Your gender:', [
 	'm' => 'male',
@@ -53,7 +53,7 @@
 	->setOption('embedNext', true);
 
 $form->addCheckbox('send', 'Ship to address')
-	->addCondition($form::FILLED) // conditional rule: if is checkbox checked...
+	->addCondition($form::Filled) // conditional rule: if is checkbox checked...
 		->toggle('sendBox'); // toggle div #sendBox
 
 
@@ -64,7 +64,7 @@
 $form->addText('street', 'Street:');
 
 $form->addText('city', 'City:')
-	->addConditionOn($form['send'], $form::FILLED)
+	->addConditionOn($form['send'], $form::Filled)
 		->setRequired('Enter your shipping address');
 
 $countries = [
@@ -77,7 +77,7 @@
 ];
 $form->addSelect('country', 'Country:', $countries)
 	->setPrompt('Select your country')
-	->addConditionOn($form['send'], $form::FILLED)
+	->addConditionOn($form['send'], $form::Filled)
 		->setRequired('Select your country');
 
 
@@ -86,14 +86,14 @@
 
 $form->addPassword('password', 'Choose password:')
 	->setRequired('Choose your password')
-	->addRule($form::MIN_LENGTH, 'The password is too short: it must be at least %d characters', 3);
+	->addRule($form::MinLength, 'The password is too short: it must be at least %d characters', 3);
 
 $form->addPassword('password2', 'Reenter password:')
 	->setRequired('Reenter your password')
-	->addRule($form::EQUAL, 'Passwords do not match', $form['password']);
+	->addRule($form::Equal, 'Passwords do not match', $form['password']);
 
 $form->addUpload('avatar', 'Picture:')
-	->addRule($form::IMAGE, 'Uploaded file is not image');
+	->addRule($form::Image, 'Uploaded file is not image');
 
 $form->addHidden('userid');
 

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)
@@ -63,9 +62,9 @@ public function isFilled(): bool
 
 	public function loadHttpData(): void
 	{
-		$this->day = $this->getHttpData(Form::DATA_LINE, '[day]');
-		$this->month = $this->getHttpData(Form::DATA_LINE, '[month]');
-		$this->year = $this->getHttpData(Form::DATA_LINE, '[year]');
+		$this->day = $this->getHttpData(Form::DataLine, '[day]');
+		$this->month = $this->getHttpData(Form::DataLine, '[month]');
+		$this->year = $this->getHttpData(Form::DataLine, '[year]');
 	}
 
 
@@ -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', [

examples/html5.php

@@ -29,14 +29,14 @@
 $form->addText('count', 'Number of results:')
 	->setHtmlType('number')
 	->setDefaultValue(10)
-	->addRule($form::INTEGER, 'Must be numeric value')
-	->addRule($form::RANGE, 'Must be in range from %d to %d', [1, 100]);
+	->addRule($form::Integer, 'Must be numeric value')
+	->addRule($form::Range, 'Must be in range from %d to %d', [1, 100]);
 
 $form->addText('precision', 'Precision:')
 	->setHtmlType('range')
 	->setDefaultValue(50)
-	->addRule($form::INTEGER, 'Precision must be numeric value')
-	->addRule($form::RANGE, 'Precision must be in range from %d to %d', [0, 100]);
+	->addRule($form::Integer, 'Precision must be numeric value')
+	->addRule($form::Range, 'Precision must be in range from %d to %d', [0, 100]);
 
 $form->addEmail('email', 'Send to email:')
 	->setHtmlAttribute('autocomplete', 'off')

examples/latte.php

@@ -24,11 +24,11 @@
 
 $form->addPassword('password', 'Choose password:')
 	->setRequired('Choose your password')
-	->addRule($form::MIN_LENGTH, 'The password is too short: it must be at least %d characters', 3);
+	->addRule($form::MinLength, 'The password is too short: it must be at least %d characters', 3);
 
 $form->addPassword('password2', 'Reenter password:')
 	->setRequired('Reenter your password')
-	->addRule($form::EQUAL, 'Passwords do not match', $form['password']);
+	->addRule($form::Equal, 'Passwords do not match', $form['password']);
 
 $form->addSubmit('submit', 'Send');
 

examples/live-validation.php

@@ -24,16 +24,16 @@
 
 $form->addText('age', 'Your age:')
 	->setRequired('Enter your age')
-	->addRule($form::INTEGER, 'Age must be numeric value')
-	->addRule($form::RANGE, 'Age must be in range from %d to %d', [10, 100]);
+	->addRule($form::Integer, 'Age must be numeric value')
+	->addRule($form::Range, 'Age must be in range from %d to %d', [10, 100]);
 
 $form->addPassword('password', 'Choose password:')
 	->setRequired('Choose your password')
-	->addRule($form::MIN_LENGTH, 'The password is too short: it must be at least %d characters', 3);
+	->addRule($form::MinLength, 'The password is too short: it must be at least %d characters', 3);
 
 $form->addPassword('password2', 'Reenter password:')
 	->setRequired('Reenter your password')
-	->addRule($form::EQUAL, 'Passwords do not match', $form['password']);
+	->addRule($form::Equal, 'Passwords do not match', $form['password']);
 
 $form->addSubmit('submit', 'Send');
 

examples/localization.php

@@ -51,8 +51,8 @@ public function translate($message, ...$parameters): string
 
 $form->addText('age', 'Your age:')
 	->setRequired('Enter your age')
-	->addRule($form::INTEGER, 'Age must be numeric value')
-	->addRule($form::RANGE, 'Age must be in range from %d to %d', [10, 100]);
+	->addRule($form::Integer, 'Age must be numeric value')
+	->addRule($form::Range, 'Age must be in range from %d to %d', [10, 100]);
 
 $countries = [
 	'World' => [

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.2.
+It requires PHP version 8.0 and supports PHP up to 8.2.
 
 
 Client-side support can be installed with npm or yarn:

src/Bridges/FormsDI/FormsExtension.php

@@ -21,7 +21,7 @@ public function __construct()
 	{
 		$this->config = new class {
 			/** @var string[] */
-			public $messages = [];
+			public array $messages = [];
 		};
 	}