Skip to content

Commit 2867961

Browse files
committed
used native callback invocation
1 parent 84e7efb commit 2867961

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/Forms/Container.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public function validate(array $controls = null): void
142142
foreach ($this->onValidate as $handler) {
143143
$params = Nette\Utils\Callback::toReflection($handler)->getParameters();
144144
$values = isset($params[1]) ? $this->getValues($params[1]->isArray()) : null;
145-
Nette\Utils\Callback::invoke($handler, $this, $values);
145+
$handler($this, $values);
146146
}
147147
}
148148
$this->validated = true;
@@ -418,7 +418,7 @@ public function __call(string $name, array $args)
418418
return (self::$extMethods[$name])($this, ...$args);
419419
} elseif ($callback = Nette\Utils\ObjectMixin::getExtensionMethod($class = __CLASS__, $name)) {
420420
trigger_error("Define extension method '$name' via $class::extensionMethod('$name', ...), don't use Nette\\Object or Nette\\Utils\\ObjectMixin.", E_USER_DEPRECATED);
421-
return Nette\Utils\Callback::invoke($callback, $this, ...$args);
421+
return $callback($this, ...$args);
422422
}
423423
return parent::__call($name, $args);
424424
}

src/Forms/Controls/BaseControl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ public function __call(string $name, array $args)
593593

594594
if ($callback = Nette\Utils\ObjectMixin::getExtensionMethod($class = static::class, $name)) {
595595
trigger_error("Define extension method '$name' via $class::extensionMethod('$name', ...), don't use Nette\\Object or Nette\\Utils\\ObjectMixin.", E_USER_DEPRECATED);
596-
return Nette\Utils\Callback::invoke($callback, $this, ...$args);
596+
return $callback($this, ...$args);
597597
}
598598
return parent::__call($name, $args);
599599
}

src/Forms/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ private function invokeHandlers(iterable $handlers, $button = null): void
433433
foreach ($handlers as $handler) {
434434
$params = Nette\Utils\Callback::toReflection($handler)->getParameters();
435435
$values = isset($params[1]) ? $this->getValues($params[1]->isArray()) : null;
436-
Nette\Utils\Callback::invoke($handler, $button ?: $this, $values);
436+
$handler($button ?: $this, $values);
437437
if (!$this->isValid()) {
438438
return;
439439
}

0 commit comments

Comments
 (0)