used PHP 7.1 features

Author: dg

examples/localization.php

@@ -31,7 +31,7 @@ function __construct(array $table)
 	 */
 	public function translate($message, $count = NULL)
 	{
-		return isset($this->table[$message]) ? $this->table[$message] : $message;
+		return $this->table[$message] ?? $message;
 	}
 }
 

src/Forms/Container.php

@@ -477,7 +477,7 @@ public function __call($name, $args)
 	public static function extensionMethod($name, $callback = NULL)
 	{
 		if (strpos($name, '::') !== FALSE) { // back compatibility
-			list(, $name) = explode('::', $name);
+			[, $name] = explode('::', $name);
 		}
 		Nette\Utils\ObjectMixin::setExtensionMethod(__CLASS__, $name, $callback);
 	}

src/Forms/ControlGroup.php

@@ -97,7 +97,7 @@ public function setOption($key, $value)
 	 */
 	public function getOption($key, $default = NULL)
 	{
-		return isset($this->options[$key]) ? $this->options[$key] : $default;
+		return $this->options[$key] ?? $default;
 	}
 
 

src/Forms/Controls/BaseControl.php

@@ -582,7 +582,7 @@ public function setOption($key, $value)
 	 */
 	public function getOption($key, $default = NULL)
 	{
-		return isset($this->options[$key]) ? $this->options[$key] : $default;
+		return $this->options[$key] ?? $default;
 	}
 
 
@@ -611,7 +611,7 @@ public function __call($name, $args)
 	public static function extensionMethod($name, $callback = NULL)
 	{
 		if (strpos($name, '::') !== FALSE) { // back compatibility
-			list(, $name) = explode('::', $name);
+			[, $name] = explode('::', $name);
 		}
 		Nette\Utils\ObjectMixin::setExtensionMethod(get_called_class(), $name, $callback);
 	}

src/Forms/Form.php

@@ -304,7 +304,7 @@ public function getGroups()
 	 */
 	public function getGroup($name)
 	{
-		return isset($this->groups[$name]) ? $this->groups[$name] : NULL;
+		return $this->groups[$name] ?? NULL;
 	}
 
 
@@ -649,9 +649,6 @@ public function __toString()
 			return $this->getRenderer()->render($this);
 
 		} catch (\Throwable $e) {
-		} catch (\Exception $e) {
-		}
-		if (isset($e)) {
 			if (func_num_args()) {
 				throw $e;
 			}

src/Forms/Helpers.php

@@ -144,19 +144,19 @@ public static function exportRules(Rules $rules)
 	 */
 	public static function createInputList(array $items, array $inputAttrs = NULL, array $labelAttrs = NULL, $wrapper = NULL)
 	{
-		list($inputAttrs, $inputTag) = self::prepareAttrs($inputAttrs, 'input');
-		list($labelAttrs, $labelTag) = self::prepareAttrs($labelAttrs, 'label');
+		[$inputAttrs, $inputTag] = self::prepareAttrs($inputAttrs, 'input');
+		[$labelAttrs, $labelTag] = self::prepareAttrs($labelAttrs, 'label');
 		$res = '';
 		$input = Html::el();
 		$label = Html::el();
-		list($wrapper, $wrapperEnd) = $wrapper instanceof Html ? [$wrapper->startTag(), $wrapper->endTag()] : [(string) $wrapper, ''];
+		[$wrapper, $wrapperEnd] = $wrapper instanceof Html ? [$wrapper->startTag(), $wrapper->endTag()] : [(string) $wrapper, ''];
 
 		foreach ($items as $value => $caption) {
 			foreach ($inputAttrs as $k => $v) {
-				$input->attrs[$k] = isset($v[$value]) ? $v[$value] : NULL;
+				$input->attrs[$k] = $v[$value] ?? NULL;
 			}
 			foreach ($labelAttrs as $k => $v) {
-				$label->attrs[$k] = isset($v[$value]) ? $v[$value] : NULL;
+				$label->attrs[$k] = $v[$value] ?? NULL;
 			}
 			$input->value = $value;
 			$res .= ($res === '' && $wrapperEnd === '' ? '' : $wrapper)
@@ -178,7 +178,7 @@ public static function createSelectBox(array $items, array $optionAttrs = NULL,
 		if ($selected !== NULL) {
 			$optionAttrs['selected?'] = $selected;
 		}
-		list($optionAttrs, $optionTag) = self::prepareAttrs($optionAttrs, 'option');
+		[$optionAttrs, $optionTag] = self::prepareAttrs($optionAttrs, 'option');
 		$option = Html::el();
 		$res = $tmp = '';
 		foreach ($items as $group => $subitems) {
@@ -191,7 +191,7 @@ public static function createSelectBox(array $items, array $optionAttrs = NULL,
 			foreach ($subitems as $value => $caption) {
 				$option->value = $value;
 				foreach ($optionAttrs as $k => $v) {
-					$option->attrs[$k] = isset($v[$value]) ? $v[$value] : NULL;
+					$option->attrs[$k] = $v[$value] ?? NULL;
 				}
 				if ($caption instanceof Html) {
 					$caption = clone $caption;

src/Forms/Rules.php

@@ -174,7 +174,7 @@ public function addFilter($filter)
 		$this->rules[] = $rule = new Rule;
 		$rule->control = $this->control;
 		$rule->validator = function (IControl $control) use ($filter) {
-			$control->setValue(call_user_func($filter, $control->getValue()));
+			$control->setValue($filter($control->getValue()));
 			return TRUE;
 		};
 		return $this;
@@ -282,7 +282,7 @@ public static function validateRule(Rule $rule)
 			$val = $val instanceof IControl ? $val->getValue() : $val;
 		}
 		return $rule->isNegative
-			xor call_user_func(self::getCallback($rule), $rule->control, is_array($rule->arg) ? $args : $args[0]);
+			xor self::getCallback($rule)($rule->control, is_array($rule->arg) ? $args : $args[0]);
 	}