BaseControl::getHtmlId() autoprefixes standalone forms with form name (BC break)

Author: dg

src/Forms/Controls/BaseControl.php

@@ -337,7 +337,10 @@ public function getHtmlId()
 	{
 		if (!isset($this->control->id)) {
 			$form = $this->getForm();
-			$this->control->id = sprintf(self::$idMask, $this->lookupPath(), $form->getName());
+			$prefix = $form instanceof Nette\Application\UI\Form || $form->getName() === null
+				? ''
+				: $form->getName() . '-';
+			$this->control->id = sprintf(self::$idMask, $prefix . $this->lookupPath());
 		}
 		return $this->control->id;
 	}

tests/Forms/Forms.idMask.phpt

@@ -40,17 +40,13 @@ test(function () {
 
 
 test(function () {
-	Nette\Forms\Controls\BaseControl::$idMask = 'frm-%s-%s';
-
 	$form = new Form;
 	$input = $form->addText('name');
-	Assert::same('frm-name-', $input->getHtmlId());
+	Assert::same('frm-name', $input->getHtmlId());
 });
 
 
 test(function () {
-	Nette\Forms\Controls\BaseControl::$idMask = 'frm-%2$s-%1$s';
-
 	$form = new Form('signForm');
 	$input = $form->addText('name');
 	Assert::same('frm-signForm-name', $input->getHtmlId());