attached() and detached() are deprecated [WIP]

nette · Dec 8, 2023 · 8c43cdd · 8c43cdd
1 parent 4781072
commit 8c43cdd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/src/ComponentModel/Component.php b/src/ComponentModel/Component.php
@@ -91,6 +91,7 @@ final public function lookupPath(?string $type = null, bool $throw = true): ?str
 	final public function monitor(string $type, ?callable $attached = null, ?callable $detached = null): void
 	{
 		if (func_num_args() === 1) {
+			trigger_error('The attached() and detached() methods are deprecated, use the second and third arguments of the monitor() method instead.', E_USER_DEPRECATED);
 			$attached = [$this, 'attached'];
 			$detached = [$this, 'detached'];
 		}

diff --git a/tests/ComponentModel/Container.attached.phpt b/tests/ComponentModel/Container.attached.phpt
@@ -18,15 +18,13 @@ class TestClass extends Container implements ArrayAccess
 {
 	use Nette\ComponentModel\ArrayAccess;
 
-	public function attached(IComponent $obj): void
+	public function __construct()
 	{
-		Notes::add(static::class . '::ATTACHED(' . $obj::class . ')');
-	}
-
-
-	public function detached(IComponent $obj): void
-	{
-		Notes::add(static::class . '::detached(' . $obj::class . ')');
+		$this->monitor(
+			IComponent::class,
+			fn(IComponent $obj) => Notes::add(static::class . '::ATTACHED(' . $obj::class . ')'),
+			fn(IComponent $obj) => Notes::add(static::class . '::detached(' . $obj::class . ')'),
+		);
 	}
 }
 

diff --git a/tests/ComponentModel/Container.clone-new.phpt b/tests/ComponentModel/Container.clone-new.phpt
@@ -64,17 +64,13 @@ class E extends TestClass
 
 function createAttached(IComponent $sender)
 {
-	return function (IComponent $obj) use ($sender) {
-		Notes::add('ATTACHED(' . $obj::class . ', ' . $sender::class . ')');
-	};
+	return fn(IComponent $obj) => Notes::add('ATTACHED(' . $obj::class . ', ' . $sender::class . ')');
 }
 
 
 function createDetached(IComponent $sender)
 {
-	return function (IComponent $obj) use ($sender) {
-		Notes::add('detached(' . $obj::class . ', ' . $sender::class . ')');
-	};
+	return fn(IComponent $obj) => Notes::add('detached(' . $obj::class . ', ' . $sender::class . ')');
 }