Container, BaseControl: extension methods are implemented independent…

…ly on ObjectMixin
nette · Feb 2, 2017 · a8c2e65 · a8c2e65
1 parent 085804c
commit a8c2e65
Show file tree

Hide file tree

Showing 4 changed files with 82 additions and 6 deletions.
diff --git a/src/Forms/Container.php b/src/Forms/Container.php
@@ -21,6 +21,9 @@
  */
 class Container extends Nette\ComponentModel\Container implements \ArrayAccess
 {
+	/** @var callable[]  extension methods */
+	private static $extMethods = [];
+
 	/** @var callable[]  function (Container $sender); Occurs when the form is validated */
 	public $onValidate;
 
@@ -410,19 +413,22 @@ public function addContainer($name): self
 
 	public function __call(string $name, array $args)
 	{
-		if ($callback = Nette\Utils\ObjectMixin::getExtensionMethod(__CLASS__, $name)) {
+		if (isset(self::$extMethods[$name])) {
+			return (self::$extMethods[$name])($this, ...$args);
+		} elseif ($callback = Nette\Utils\ObjectMixin::getExtensionMethod($class = __CLASS__, $name)) {
+			trigger_error("Define extension method '$name' via $class::extensionMethod('$name', ...), don't use Nette\\Object or Nette\\Utils\\ObjectMixin.", E_USER_DEPRECATED);
 			return Nette\Utils\Callback::invoke($callback, $this, ...$args);
 		}
 		return parent::__call($name, $args);
 	}
 
 
-	public static function extensionMethod($name, /*callable*/ $callback = NULL): void
+	public static function extensionMethod($name, /*callable*/ $callback): void
 	{
 		if (strpos($name, '::') !== FALSE) { // back compatibility
 			[, $name] = explode('::', $name);
 		}
-		Nette\Utils\ObjectMixin::setExtensionMethod(__CLASS__, $name, $callback);
+		self::$extMethods[$name] = $callback;
 	}
 
 

diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
@@ -40,6 +40,9 @@ abstract class BaseControl extends Nette\ComponentModel\Component implements ICo
 	/** @var string */
 	public static $idMask = 'frm-%s';
 
+	/** @var callable[][]  extension methods */
+	private static $extMethods = [];
+
 	/** @var string|object textual caption or label */
 	public $caption;
 
@@ -556,19 +559,28 @@ public function getOptions(): array
 
 	public function __call(string $name, array $args)
 	{
-		if ($callback = Nette\Utils\ObjectMixin::getExtensionMethod(get_class($this), $name)) {
+		$class = static::class;
+		do {
+			if (isset(self::$extMethods[$name][$class])) {
+				return (self::$extMethods[$name][$class])($this, ...$args);
+			}
+			$class = get_parent_class($class);
+		} while ($class);
+
+		if ($callback = Nette\Utils\ObjectMixin::getExtensionMethod($class = static::class, $name)) {
+			trigger_error("Define extension method '$name' via $class::extensionMethod('$name', ...), don't use Nette\\Object or Nette\\Utils\\ObjectMixin.", E_USER_DEPRECATED);
 			return Nette\Utils\Callback::invoke($callback, $this, ...$args);
 		}
 		return parent::__call($name, $args);
 	}
 
 
-	public static function extensionMethod(string $name, /*callable*/ $callback = NULL): void
+	public static function extensionMethod($name, /*callable*/ $callback): void
 	{
 		if (strpos($name, '::') !== FALSE) { // back compatibility
 			[, $name] = explode('::', $name);
 		}
-		Nette\Utils\ObjectMixin::setExtensionMethod(get_called_class(), $name, $callback);
+		self::$extMethods[$name][static::class] = $callback;
 	}
 
 }
diff --git a/tests/Forms/BaseControl.extensionMethod.phpt b/tests/Forms/BaseControl.extensionMethod.phpt
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Forms\Controls\TextBase;
+use Nette\Forms\Controls\TextInput;
+use Nette\Forms\Controls\Checkbox;
+use Nette\Forms\Controls\Button;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+TextBase::extensionMethod('test', function ($control, $a, $b) {
+	Assert::type(TextInput::class, $control);
+	Assert::same(1, $a);
+	Assert::same(2, $b);
+	return 'TextInput';
+});
+
+Checkbox::extensionMethod('test', function ($control, $a, $b) {
+	Assert::type(Checkbox::class, $control);
+	Assert::same(1, $a);
+	Assert::same(2, $b);
+	return 'Checkbox';
+});
+
+$control1 = new TextInput;
+Assert::same('TextInput', $control1->test(1, 2));
+
+$control2 = new Checkbox;
+Assert::same('Checkbox', $control2->test(1, 2));
+
+Assert::exception(function () {
+	$control3 = new Button;
+	$control3->test(1, 2);
+}, Nette\MemberAccessException::class);
diff --git a/tests/Forms/Container.extensionMethod.phpt b/tests/Forms/Container.extensionMethod.phpt
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\Forms\Form;
+use Tester\Assert;
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+Nette\Forms\Container::extensionMethod('test', function ($form, $a, $b) {
+	Assert::type(Nette\Forms\Form::class, $form);
+	Assert::same(1, $a);
+	Assert::same(2, $b);
+	return 3;
+});
+
+$form = new Form;
+Assert::same(3, $form->test(1, 2));