From 1303766d8adae1fc1a4654fd813a88b4f4e9b867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Glawaty?= Date: Wed, 13 Jun 2018 00:02:40 +0200 Subject: [PATCH] Removed dependency on deprecated Nette\Object - added calling of method "Nette\Forms\Container::extensionMethod" instead of "Nette\Object::extensionMethod" --- src/Controls/NotTranslatableRadioList.php | 12 ++++-------- src/Controls/NotTranslatableSelectBox.php | 17 +++++++---------- src/Controls/TextInputCustomLabel.php | 13 +++++-------- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/src/Controls/NotTranslatableRadioList.php b/src/Controls/NotTranslatableRadioList.php index e17446e..32777b8 100644 --- a/src/Controls/NotTranslatableRadioList.php +++ b/src/Controls/NotTranslatableRadioList.php @@ -62,14 +62,10 @@ public function getControl() * @return void */ public static function register($control_name = 'addNotTranslatableRadioList') { - Nette\Object::extensionMethod( - 'Nette\Forms\Container::' . $control_name, - function ($form, $name, $label = NULL, array $items = NULL) { - $control = new self($label, $items); + Nette\Forms\Container::extensionMethod($control_name, function ($form, $name, $label = NULL, array $items = NULL) { + $control = new self($label, $items); - return $form[$name] = $control; - } - ); + return $form[$name] = $control; + }); } - } diff --git a/src/Controls/NotTranslatableSelectBox.php b/src/Controls/NotTranslatableSelectBox.php index dd2dc94..b0385c9 100644 --- a/src/Controls/NotTranslatableSelectBox.php +++ b/src/Controls/NotTranslatableSelectBox.php @@ -73,18 +73,15 @@ public function getControl() * @return void */ public static function register($control_name = 'addNotTranslatableSelect') { - Nette\Object::extensionMethod( - 'Nette\Forms\Container::' . $control_name, - function ($form, $name, $label = NULL, array $items = NULL, $size = NULL) { - $control = new self($label, $items); + Nette\Forms\Container::extensionMethod($control_name, function ($form, $name, $label = NULL, array $items = NULL, $size = NULL) { + $control = new self($label, $items); - if ($size > 1) { - $control->setAttribute('size', (int) $size); - } - - return $form[$name] = $control; + if ($size > 1) { + $control->setAttribute('size', (int) $size); } - ); + + return $form[$name] = $control; + }); } } diff --git a/src/Controls/TextInputCustomLabel.php b/src/Controls/TextInputCustomLabel.php index d071125..06b1266 100644 --- a/src/Controls/TextInputCustomLabel.php +++ b/src/Controls/TextInputCustomLabel.php @@ -19,14 +19,11 @@ class TextInputCustomLabel extends Nette\Forms\Controls\TextInput * @return void */ public static function register($control_name = 'addTextCustomLabel') { - Nette\Object::extensionMethod( - 'Nette\Forms\Container::' . $control_name, - function ($form, $name, $label = NULL, array $items = NULL) { - $control = new self($label, $items); - - return $form[$name] = $control; - } - ); + Nette\Forms\Container::extensionMethod($control_name, function ($form, $name, $label = NULL, array $items = NULL) { + $control = new self($label, $items); + + return $form[$name] = $control; + }); }