used PHP 7.1 features

dg · dg · commit 5d7cbc28b536 · 2017-01-29T20:05:17.000+01:00
diff --git a/examples/custom-rendering.php b/examples/custom-rendering.php
@@ -29,7 +29,7 @@
 $renderer->wrappers['control']['.odd'] = 'odd';
 $renderer->wrappers['label']['container'] = 'dt';
 $renderer->wrappers['label']['suffix'] = ':';
-$renderer->wrappers['control']['requiredsuffix'] = " \xE2\x80\xA2";
+$renderer->wrappers['control']['requiredsuffix'] = " \u{2022}";
 
 
 $form->addGroup('Personal data');
diff --git a/examples/localization.php b/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;
 	}
 }
 
diff --git a/src/Forms/Container.php b/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);
 	}
diff --git a/src/Forms/ControlGroup.php b/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;
 	}
 
 
diff --git a/src/Forms/Controls/BaseControl.php b/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);
 	}
diff --git a/src/Forms/Form.php b/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;
 			}
diff --git a/src/Forms/Helpers.php b/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;
diff --git a/src/Forms/Rules.php b/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]);
 	}
 
 
diff --git a/tests/Forms/Controls.TestBase.validators.phpt b/tests/Forms/Controls.TestBase.validators.phpt
@@ -56,10 +56,10 @@ test(function () {
 	$control->value = 'name@a-b-c.cz';
 	Assert::true(Validator::validateEmail($control));
 
-	$control->value = "name@\xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd.cz"; // name@žluťoučký.cz
+	$control->value = "name@\u{17E}lu\u{165}ou\u{10D}k\u{FD}.cz"; // name@žluťoučký.cz
 	Assert::true(Validator::validateEmail($control));
 
-	$control->value = "\xc5\xbename@\xc5\xbelu\xc5\xa5ou\xc4\x8dk\xc3\xbd.cz"; // žname@žluťoučký.cz
+	$control->value = "\u{17E}name@\u{17E}lu\u{165}ou\u{10D}k\u{FD}.cz"; // žname@žluťoučký.cz
 	Assert::false(Validator::validateEmail($control));
 });
 
diff --git a/tests/Forms/Forms.renderer.2.phpt b/tests/Forms/Forms.renderer.2.phpt
@@ -47,7 +47,7 @@ $renderer->wrappers['control']['.odd'] = 'odd';
 $renderer->wrappers['control']['errors'] = TRUE;
 $renderer->wrappers['label']['container'] = 'dt';
 $renderer->wrappers['label']['suffix'] = ':';
-$renderer->wrappers['control']['requiredsuffix'] = " \xE2\x80\xA2";
+$renderer->wrappers['control']['requiredsuffix'] = " \u{2022}";
 
 
 $form->addGroup('Personal data');

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ function __construct(array $table)`
`31`	`31`	`*/`
`32`	`32`	`public function translate($message, $count = NULL)`
`33`	`33`	`{`
`34`		`- return isset($this->table[$message]) ? $this->table[$message] : $message;`
	`34`	`+ return $this->table[$message] ?? $message;`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -477,7 +477,7 @@ public function __call($name, $args)`
`477`	`477`	`public static function extensionMethod($name, $callback = NULL)`
`478`	`478`	`{`
`479`	`479`	`if (strpos($name, '::') !== FALSE) { // back compatibility`
`480`		`- list(, $name) = explode('::', $name);`
	`480`	`+ [, $name] = explode('::', $name);`
`481`	`481`	`}`
`482`	`482`	`Nette\Utils\ObjectMixin::setExtensionMethod(__CLASS__, $name, $callback);`
`483`	`483`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public function setOption($key, $value)`
`97`	`97`	`*/`
`98`	`98`	`public function getOption($key, $default = NULL)`
`99`	`99`	`{`
`100`		`- return isset($this->options[$key]) ? $this->options[$key] : $default;`
	`100`	`+ return $this->options[$key] ?? $default;`
`101`	`101`	`}`
`102`	`102`
`103`	`103`
Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,7 @@ public function setOption($key, $value)`
`582`	`582`	`*/`
`583`	`583`	`public function getOption($key, $default = NULL)`
`584`	`584`	`{`
`585`		`- return isset($this->options[$key]) ? $this->options[$key] : $default;`
	`585`	`+ return $this->options[$key] ?? $default;`
`586`	`586`	`}`
`587`	`587`
`588`	`588`
`@@ -611,7 +611,7 @@ public function __call($name, $args)`
`611`	`611`	`public static function extensionMethod($name, $callback = NULL)`
`612`	`612`	`{`
`613`	`613`	`if (strpos($name, '::') !== FALSE) { // back compatibility`
`614`		`- list(, $name) = explode('::', $name);`
	`614`	`+ [, $name] = explode('::', $name);`
`615`	`615`	`}`
`616`	`616`	`Nette\Utils\ObjectMixin::setExtensionMethod(get_called_class(), $name, $callback);`
`617`	`617`	`}`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ public function getGroups()`
`304`	`304`	`*/`
`305`	`305`	`public function getGroup($name)`
`306`	`306`	`{`
`307`		`- return isset($this->groups[$name]) ? $this->groups[$name] : NULL;`
	`307`	`+ return $this->groups[$name] ?? NULL;`
`308`	`308`	`}`
`309`	`309`
`310`	`310`
`@@ -649,9 +649,6 @@ public function __toString()`
`649`	`649`	`return $this->getRenderer()->render($this);`
`650`	`650`
`651`	`651`	`} catch (\Throwable $e) {`
`652`		`- } catch (\Exception $e) {`
`653`		`- }`
`654`		`- if (isset($e)) {`
`655`	`652`	`if (func_num_args()) {`
`656`	`653`	`throw $e;`
`657`	`654`	`}`