attached() replaced with callbacks

Author: dg

src/Forms/Controls/BaseControl.php

@@ -83,7 +83,6 @@ abstract class BaseControl extends Nette\ComponentModel\Component implements ICo
 	 */
 	public function __construct($caption = null)
 	{
-		$this->monitor(Form::class);
 		parent::__construct();
 		$this->control = Html::el('input', ['type' => null, 'name' => null]);
 		$this->label = Html::el('label');
@@ -93,6 +92,11 @@ public function __construct($caption = null)
 			$this->setRequired(false);
 		}
 		$this->setValue(null);
+		$this->monitor(Form::class, function (Form $form) {
+			if (!$this->isDisabled() && $form->isAnchored() && $form->isSubmitted()) {
+				$this->loadHttpData();
+			}
+		});
 	}
 
 
@@ -117,17 +121,6 @@ public function getCaption()
 	}
 
 
-	/**
-	 * This method will be called when the component becomes attached to Form.
-	 */
-	protected function attached(Nette\ComponentModel\IComponent $form): void
-	{
-		if (!$this->isDisabled() && $form instanceof Form && $form->isAnchored() && $form->isSubmitted()) {
-			$this->loadHttpData();
-		}
-	}
-
-
 	/**
 	 * Returns form.
 	 */

src/Forms/Controls/CsrfProtection.php

@@ -10,6 +10,7 @@
 namespace Nette\Forms\Controls;
 
 use Nette;
+use Nette\Application\UI\Presenter;
 
 
 /**
@@ -32,16 +33,12 @@ public function __construct($errorMessage)
 		$this->setOmitted()
 			->setRequired()
 			->addRule(self::PROTECTION, $errorMessage);
-		$this->monitor(Nette\Application\UI\Presenter::class);
-	}
-
 
-	protected function attached(Nette\ComponentModel\IComponent $parent): void
-	{
-		parent::attached($parent);
-		if (!$this->session && $parent instanceof Nette\Application\UI\Presenter) {
-			$this->session = $parent->getSession();
-		}
+		$this->monitor(Presenter::class, function (Presenter $presenter) {
+			if (!$this->session) {
+				$this->session = $presenter->getSession();
+			}
+		});
 	}
 
 

src/Forms/Controls/UploadControl.php

@@ -34,22 +34,13 @@ public function __construct($label = null, bool $multiple = false)
 		$this->setOption('type', 'file');
 		$this->addCondition(Forms\Form::FILLED)
 			->addRule([$this, 'isOk'], Forms\Validator::$messages[self::VALID]);
-	}
-
 
-	/**
-	 * This method will be called when the component (or component's parent)
-	 * becomes attached to a monitored object. Do not call this method yourself.
-	 */
-	protected function attached(Nette\ComponentModel\IComponent $form): void
-	{
-		if ($form instanceof Nette\Forms\Form) {
+		$this->monitor(Forms\Form::class, function (Forms\Form $form) {
 			if (!$form->isMethod('post')) {
 				throw new Nette\InvalidStateException('File upload requires method POST.');
 			}
 			$form->getElementPrototype()->enctype = 'multipart/form-data';
-		}
-		parent::attached($form);
+		});
 	}
 
 

src/Forms/Form.php

@@ -133,25 +133,9 @@ public function __construct(string $name = null)
 			$this[self::TRACKER_ID] = $tracker;
 			$this->setParent(null, $name);
 		}
-	}
-
-
-	protected function validateParent(Nette\ComponentModel\IContainer $parent): void
-	{
-		parent::validateParent($parent);
-		$this->monitor(__CLASS__);
-	}
-
-
-	/**
-	 * This method will be called when the component (or component's parent)
-	 * becomes attached to a monitored object. Do not call this method yourself.
-	 */
-	protected function attached(Nette\ComponentModel\IComponent $obj): void
-	{
-		if ($obj instanceof self) {
+		$this->monitor(__CLASS__, function () {
 			throw new Nette\InvalidStateException('Nested forms are forbidden.');
-		}
+		});
 	}