compatibility with nette/component-model 3.0

Author: dg

composer.json

@@ -15,7 +15,7 @@
 	],
 	"require": {
 		"php": ">=7.1",
-		"nette/component-model": "^2.3",
+		"nette/component-model": "^3.0",
 		"nette/http": "^3.0",
 		"nette/utils": "^2.4 || ^3.0"
 	},
@@ -26,7 +26,7 @@
 	"require-dev": {
 		"nette/tester": "^2.0",
 		"nette/di": "^2.4 || ~3.0.0",
-		"nette/forms": "^2.4",
+		"nette/forms": "^3.0",
 		"nette/robot-loader": "^2.4.2 || ^3.0",
 		"nette/security": "^3.0",
 		"latte/latte": "^2.4.3",

src/Application/UI/Component.php

@@ -56,10 +56,8 @@ public function getUniqueId()
 	/**
 	 * This method will be called when the component (or component's parent)
 	 * becomes attached to a monitored object. Do not call this method yourself.
-	 * @param  Nette\ComponentModel\IComponent
-	 * @return void
 	 */
-	protected function attached($presenter)
+	protected function attached(Nette\ComponentModel\IComponent $presenter): void
 	{
 		if ($presenter instanceof Presenter) {
 			$this->loadState($presenter->popGlobalParameters($this->getUniqueId()));
@@ -68,10 +66,7 @@ protected function attached($presenter)
 	}
 
 
-	/**
-	 * @return void
-	 */
-	protected function validateParent(Nette\ComponentModel\IContainer $parent)
+	protected function validateParent(Nette\ComponentModel\IContainer $parent): void
 	{
 		parent::validateParent($parent);
 		$this->monitor(Presenter::class);

src/Application/UI/Form.php

@@ -32,10 +32,7 @@ public function __construct(Nette\ComponentModel\IContainer $parent = NULL, $nam
 	}
 
 
-	/**
-	 * @return void
-	 */
-	protected function validateParent(Nette\ComponentModel\IContainer $parent)
+	protected function validateParent(Nette\ComponentModel\IContainer $parent): void
 	{
 		parent::validateParent($parent);
 		$this->monitor(Presenter::class);
@@ -56,10 +53,8 @@ public function getPresenter($throw = TRUE)
 	/**
 	 * This method will be called when the component (or component's parent)
 	 * becomes attached to a monitored object. Do not call this method yourself.
-	 * @param  Nette\ComponentModel\IComponent
-	 * @return void
 	 */
-	protected function attached($presenter)
+	protected function attached(Nette\ComponentModel\IComponent $presenter): void
 	{
 		if ($presenter instanceof Presenter) {
 			if (!isset($this->getElementPrototype()->id)) {

src/Application/UI/Multiplier.php

@@ -28,7 +28,7 @@ public function __construct(callable $factory)
 	}
 
 
-	protected function createComponent($name)
+	protected function createComponent(string $name): Nette\ComponentModel\IComponent
 	{
 		return ($this->factory)($name, $this);
 	}