diff --git a/examples/latte/form-bootstrap5.latte b/examples/latte/form-bootstrap5.latte
index df1e7365f..6d7bcae96 100644
--- a/examples/latte/form-bootstrap5.latte
+++ b/examples/latte/form-bootstrap5.latte
@@ -1,6 +1,6 @@
{* Generic form template for Bootstrap v5 *}
-{parameters $name}
+{define bootstrap-form, $name}
getOption(type) in [text, select, textarea, datetime, file]}
{input $control class => form-control}
diff --git a/examples/latte/form.latte b/examples/latte/form.latte
index 63838cc59..f0230cd68 100644
--- a/examples/latte/form.latte
+++ b/examples/latte/form.latte
@@ -1,6 +1,6 @@
{* Generic form template *}
-{parameters $name}
+{define form, $name}
+{/define}
-{define controls array $controls}
+{define local controls, array $controls}
{* Loop over form controls and render each one *}
@@ -11,7 +13,7 @@
Nette Forms & Bootstrap v5 rendering example
- {include form-bootstrap5.latte $form}
+ {include bootstrap-form, $form}
diff --git a/src/Forms/Helpers.php b/src/Forms/Helpers.php
index d20eecad7..fcdb1d939 100644
--- a/src/Forms/Helpers.php
+++ b/src/Forms/Helpers.php
@@ -66,7 +66,7 @@ private static function sanitize(int $type, $value)
{
if ($type === Form::DataText) {
return is_scalar($value)
- ? Strings::normalizeNewLines($value)
+ ? Strings::normalizeNewLines((string) $value)
: null;
} elseif ($type === Form::DataLine) {
diff --git a/src/Forms/Validator.php b/src/Forms/Validator.php
index c56d84482..04a2c3f5a 100644
--- a/src/Forms/Validator.php
+++ b/src/Forms/Validator.php
@@ -381,7 +381,7 @@ public static function validateMimeType(Controls\UploadControl $control, $mimeTy
{
$mimeTypes = is_array($mimeType) ? $mimeType : explode(',', $mimeType);
foreach (static::toArray($control->getValue()) as $file) {
- $type = strtolower($file->getContentType());
+ $type = strtolower($file->getContentType() ?? '');
if (!in_array($type, $mimeTypes, true) && !in_array(preg_replace('#/.*#', '/*', $type), $mimeTypes, true)) {
return false;
}
diff --git a/tests/Forms/Forms.renderer.1.phpt b/tests/Forms/Forms.renderer.1.phpt
index e48aa102c..228c68962 100644
--- a/tests/Forms/Forms.renderer.1.phpt
+++ b/tests/Forms/Forms.renderer.1.phpt
@@ -127,4 +127,4 @@ $form->setDefaults($defaults);
$form->onSuccess[] = function () {};
$form->fireEvents();
-Assert::matchFile(__DIR__ . '/Forms.renderer.1.expect', $form->__toString(true));
+Assert::matchFile(__DIR__ . '/expected/Forms.renderer.1.expect', $form->__toString(true));
diff --git a/tests/Forms/Forms.renderer.2.phpt b/tests/Forms/Forms.renderer.2.phpt
index 201a2fe88..29ecdc51b 100644
--- a/tests/Forms/Forms.renderer.2.phpt
+++ b/tests/Forms/Forms.renderer.2.phpt
@@ -132,4 +132,4 @@ $form->setDefaults($defaults);
$form->onSuccess[] = function () {};
$form->fireEvents();
-Assert::matchFile(__DIR__ . '/Forms.renderer.2.expect', $form->__toString(true));
+Assert::matchFile(__DIR__ . '/expected/Forms.renderer.2.expect', $form->__toString(true));
diff --git a/tests/Forms/Forms.renderer.5.phpt b/tests/Forms/Forms.renderer.5.phpt
index 7f6b53371..c35e056e6 100644
--- a/tests/Forms/Forms.renderer.5.phpt
+++ b/tests/Forms/Forms.renderer.5.phpt
@@ -48,4 +48,4 @@ $form->addSubmit('submit', 'Order');
$form->fireEvents();
-Assert::matchFile(__DIR__ . '/Forms.renderer.5.expect', $form->__toString(true));
+Assert::matchFile(__DIR__ . '/expected/Forms.renderer.5.expect', $form->__toString(true));
diff --git a/tests/Forms/Forms.renderer.translate.phpt b/tests/Forms/Forms.renderer.translate.phpt
index d1b8b7267..65c3f2061 100644
--- a/tests/Forms/Forms.renderer.translate.phpt
+++ b/tests/Forms/Forms.renderer.translate.phpt
@@ -42,7 +42,7 @@ $form->addPassword('password', 'Password')
$form->addSubmit('submit', 'Send');
-Assert::matchFile(__DIR__ . '/Forms.renderer.translate.expect', $form->__toString(true));
+Assert::matchFile(__DIR__ . '/expected/Forms.renderer.translate.expect', $form->__toString(true));
// Checking whether translation is not duplicated
diff --git a/tests/Forms/Forms.renderer.1.expect b/tests/Forms/expected/Forms.renderer.1.expect
similarity index 100%
rename from tests/Forms/Forms.renderer.1.expect
rename to tests/Forms/expected/Forms.renderer.1.expect
diff --git a/tests/Forms/Forms.renderer.2.expect b/tests/Forms/expected/Forms.renderer.2.expect
similarity index 100%
rename from tests/Forms/Forms.renderer.2.expect
rename to tests/Forms/expected/Forms.renderer.2.expect
diff --git a/tests/Forms/Forms.renderer.5.expect b/tests/Forms/expected/Forms.renderer.5.expect
similarity index 100%
rename from tests/Forms/Forms.renderer.5.expect
rename to tests/Forms/expected/Forms.renderer.5.expect
diff --git a/tests/Forms/Forms.renderer.translate.expect b/tests/Forms/expected/Forms.renderer.translate.expect
similarity index 100%
rename from tests/Forms/Forms.renderer.translate.expect
rename to tests/Forms/expected/Forms.renderer.translate.expect