compatibility with nette/forms 3.0

Author: dg

composer.json

@@ -36,7 +36,7 @@
 	"conflict": {
 		"nette/nette": "<2.2",
 		"nette/di": "<2.4",
-		"nette/forms": "<2.4",
+		"nette/forms": "<3.0",
 		"nette/latte": "<2.4"
 	},
 	"autoload": {

src/Application/UI/Form.php

@@ -83,26 +83,25 @@ protected function attached(Nette\ComponentModel\IComponent $presenter): void
 	 * Tells if the form is anchored.
 	 * @return bool
 	 */
-	public function isAnchored()
+	public function isAnchored(): bool
 	{
 		return (bool) $this->getPresenter(FALSE);
 	}
 
 
 	/**
 	 * Internal: returns submitted HTTP data or NULL when form was not submitted.
-	 * @return array|NULL
 	 */
-	protected function receiveHttpData()
+	protected function receiveHttpData(): ?array
 	{
 		$presenter = $this->getPresenter();
 		if (!$presenter->isSignalReceiver($this, 'submit')) {
-			return;
+			return NULL;
 		}
 
 		$request = $presenter->getRequest();
 		if ($request->isMethod('forward') || $request->isMethod('post') !== $this->isMethod('post')) {
-			return;
+			return NULL;
 		}
 
 		if ($this->isMethod('post')) {
@@ -119,7 +118,7 @@ protected function beforeRender()
 		$key = ($this->isMethod('post') ? '_' : '') . Presenter::SIGNAL_KEY;
 		if (!isset($this[$key])) {
 			$do = $this->lookupPath(Presenter::class) . self::NAME_SEPARATOR . 'submit';
-			$this[$key] = (new Nette\Forms\Controls\HiddenField($do))->setOmitted()->setHtmlId(FALSE);
+			$this[$key] = (new Nette\Forms\Controls\HiddenField($do))->setOmitted();
 		}
 	}