Merge pull request #93 from JanTvrdik/php56

dg · dg · commit f49f8cfb87c8 · 2015-08-26T13:31:40.000+02:00
5.6
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,5 @@
 language: php
 php:
-    - 5.4
-    - 5.5
     - 5.6
     - 7.0
     - hhvm
@@ -12,7 +10,7 @@ matrix:
         - php: hhvm
 
     include:
-        - php: 5.5
+        - php: 5.6
           env: dependencies="--prefer-lowest --prefer-stable"
 
 script:
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
 		}
 	],
 	"require": {
-		"php": ">=5.4.4",
+		"php": ">=5.6.0",
 		"nette/component-model": "~2.2",
 		"nette/http": "~2.2",
 		"nette/utils": "~2.2"
diff --git a/src/Bridges/FormsLatte/Runtime.php b/src/Bridges/FormsLatte/Runtime.php
@@ -56,13 +56,13 @@ public static function renderFormEnd(Form $form, $withTags = TRUE)
 			}
 		}
 
-		foreach ($form->getComponents(TRUE, 'Nette\Forms\Controls\HiddenField') as $control) {
+		foreach ($form->getComponents(TRUE, Nette\Forms\Controls\HiddenField::class) as $control) {
 			if (!$control->getOption('rendered')) {
 				$s .= $control->getControl();
 			}
 		}
 
-		if (iterator_count($form->getComponents(TRUE, 'Nette\Forms\Controls\TextInput')) < 2) {
+		if (iterator_count($form->getComponents(TRUE, Nette\Forms\Controls\TextInput::class)) < 2) {
 			$s .= "<!--[if IE]><input type=IEbug disabled style=\"display:none\"><![endif]-->\n";
 		}
 
diff --git a/src/Forms/Container.php b/src/Forms/Container.php
@@ -207,7 +207,7 @@ public function addComponent(Nette\ComponentModel\IComponent $component, $name,
 	 */
 	public function getControls()
 	{
-		return $this->getComponents(TRUE, 'Nette\Forms\IControl');
+		return $this->getComponents(TRUE, IControl::class);
 	}
 
 
@@ -218,7 +218,7 @@ public function getControls()
 	 */
 	public function getForm($need = TRUE)
 	{
-		return $this->lookup('Nette\Forms\Form', $need);
+		return $this->lookup(Form::class, $need);
 	}
 
 
diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
@@ -75,7 +75,7 @@ abstract class BaseControl extends Nette\ComponentModel\Component implements ICo
 	 */
 	public function __construct($caption = NULL)
 	{
-		$this->monitor('Nette\Forms\Form');
+		$this->monitor(Form::class);
 		parent::__construct();
 		$this->control = Html::el('input', ['type' => NULL, 'name' => NULL]);
 		$this->label = Html::el('label');
@@ -105,7 +105,7 @@ protected function attached($form)
 	 */
 	public function getForm($need = TRUE)
 	{
-		return $this->lookup('Nette\Forms\Form', $need);
+		return $this->lookup(Form::class, $need);
 	}
 
 
@@ -135,7 +135,7 @@ public function getHttpData($type, $htmlTail = NULL)
 	 */
 	public function getHtmlName()
 	{
-		return Nette\Forms\Helpers::generateHtmlName($this->lookupPath('Nette\Forms\Form'));
+		return Nette\Forms\Helpers::generateHtmlName($this->lookupPath(Form::class));
 	}
 
 
diff --git a/src/Forms/Controls/CsrfProtection.php b/src/Forms/Controls/CsrfProtection.php
@@ -29,7 +29,7 @@ public function __construct($message)
 	{
 		parent::__construct();
 		$this->setOmitted()->addRule(self::PROTECTION, $message);
-		$this->monitor('Nette\Application\UI\Presenter');
+		$this->monitor(Nette\Application\UI\Presenter::class);
 	}
 
 
diff --git a/src/Forms/Controls/HiddenField.php b/src/Forms/Controls/HiddenField.php
@@ -24,7 +24,7 @@ public function __construct($persistentValue = NULL)
 		parent::__construct();
 		$this->control->type = 'hidden';
 		if ($persistentValue !== NULL) {
-			$this->unmonitor('Nette\Forms\Form');
+			$this->unmonitor(Nette\Forms\Form::class);
 			$this->persistValue = TRUE;
 			$this->value = (string) $persistentValue;
 		}
diff --git a/src/Forms/Controls/SubmitButton.php b/src/Forms/Controls/SubmitButton.php
@@ -112,7 +112,7 @@ public function getControl($caption = NULL)
 	{
 		$scope = [];
 		foreach ((array) $this->validationScope as $control) {
-			$scope[] = $control->lookupPath('Nette\Forms\Form');
+			$scope[] = $control->lookupPath(Nette\Forms\Form::class);
 		}
 		return parent::getControl($caption)->addAttributes([
 			'formnovalidate' => $this->validationScope !== NULL,
diff --git a/src/Forms/Rendering/DefaultFormRenderer.php b/src/Forms/Rendering/DefaultFormRenderer.php
@@ -193,7 +193,7 @@ public function renderEnd()
 				$s .= $control->getControl();
 			}
 		}
-		if (iterator_count($this->form->getComponents(TRUE, 'Nette\Forms\Controls\TextInput')) < 2) {
+		if (iterator_count($this->form->getComponents(TRUE, Nette\Forms\Controls\TextInput::class)) < 2) {
 			$s .= '<!--[if IE]><input type=IEbug disabled style="display:none"><![endif]-->';
 		}
 		if ($s) {
diff --git a/tests/Forms.DI/FormsExtension.phpt b/tests/Forms.DI/FormsExtension.phpt
@@ -49,4 +49,4 @@ Assert::exception(function () {
 	', 'neon'));
 
 	eval($compiler->compile($config, 'Container2'));
-}, 'Nette\InvalidArgumentException', 'Constant Nette\Forms\Form::Foo\Bar or constant Foo\Bar does not exist.');
+}, Nette\InvalidArgumentException::class, 'Constant Nette\Forms\Form::Foo\Bar or constant Foo\Bar does not exist.');
diff --git a/tests/Forms.Latte/FormMacros.error.phpt b/tests/Forms.Latte/FormMacros.error.phpt
@@ -18,34 +18,34 @@ FormMacros::install($latte->getCompiler());
 
 Assert::exception(function () use ($latte) {
 	$latte->compile('<form n:form></form>');
-}, 'Latte\CompileException', 'Did you mean <form n:name=...> ?');
+}, Latte\CompileException::class, 'Did you mean <form n:name=...> ?');
 
 Assert::exception(function () use ($latte) {
 	$latte->compile('<form n:name></form>');
-}, 'Latte\CompileException', 'Missing name in n:name.');
+}, Latte\CompileException::class, 'Missing name in n:name.');
 
 Assert::exception(function () use ($latte) {
 	$latte->compile('<form n:inner-name></form>');
-}, 'Latte\CompileException', 'Unknown attribute n:inner-name, use n:name attribute.');
+}, Latte\CompileException::class, 'Unknown attribute n:inner-name, use n:name attribute.');
 
 
 Assert::exception(function () use ($latte) {
 	$latte->compile('<html>{form /}');
-}, 'Latte\CompileException', 'Missing form name in {form}.');
+}, Latte\CompileException::class, 'Missing form name in {form}.');
 
 Assert::exception(function () use ($latte) {
 	$latte->compile('<html>{formContainer /}');
-}, 'Latte\CompileException', 'Missing name in {formContainer}.');
+}, Latte\CompileException::class, 'Missing name in {formContainer}.');
 
 
 Assert::exception(function () use ($latte) {
 	$latte->compile('<html>{label /}');
-}, 'Latte\CompileException', 'Missing name in {label}.');
+}, Latte\CompileException::class, 'Missing name in {label}.');
 
 Assert::exception(function () use ($latte) {
 	$latte->compile('<html>{input /}');
-}, 'Latte\CompileException', 'Missing name in {input}.');
+}, Latte\CompileException::class, 'Missing name in {input}.');
 
 Assert::exception(function () use ($latte) {
 	$latte->compile('<html>{name /}');
-}, 'Latte\CompileException', 'Unknown macro {name}, use n:name attribute.');
+}, Latte\CompileException::class, 'Unknown macro {name}, use n:name attribute.');
diff --git a/tests/Forms/Controls.Button.render.phpt b/tests/Forms/Controls.Button.render.phpt
@@ -26,7 +26,7 @@ test(function () {
 	$input = $form->addButton('button', 'Caption');
 
 	Assert::null($input->getLabel());
-	Assert::type('Nette\Utils\Html', $input->getControl());
+	Assert::type(Nette\Utils\Html::class, $input->getControl());
 	Assert::same('<input type="button" name="button" value="Caption">', (string) $input->getControl());
 	Assert::same('<input type="button" name="button" value="Another caption">', (string) $input->getControl('Another caption'));
 });
@@ -74,7 +74,7 @@ test(function () { // SubmitButton
 	$input = $form->addSubmit('button', 'Caption');
 
 	Assert::null($input->getLabel());
-	Assert::type('Nette\Utils\Html', $input->getControl());
+	Assert::type(Nette\Utils\Html::class, $input->getControl());
 	Assert::same('<input type="submit" name="button" value="Caption">', (string) $input->getControl());
 	Assert::same('<input type="submit" name="button" value="Another caption">', (string) $input->getControl('Another caption'));
 });
diff --git a/tests/Forms/Controls.Checkbox.loadData.phpt b/tests/Forms/Controls.Checkbox.loadData.phpt
@@ -54,5 +54,5 @@ test(function () { // setValue() and invalid argument
 
 	Assert::exception(function () use ($input) {
 		$input->setValue([]);
-	}, 'Nette\InvalidArgumentException', "Value must be scalar or NULL, array given in field 'checkbox'.");
+	}, Nette\InvalidArgumentException::class, "Value must be scalar or NULL, array given in field 'checkbox'.");
 });
diff --git a/tests/Forms/Controls.Checkbox.render.phpt b/tests/Forms/Controls.Checkbox.render.phpt
@@ -27,13 +27,13 @@ test(function () {
 
 	Assert::null($input->getLabel());
 
-	Assert::type('Nette\Utils\Html', $input->getControl());
+	Assert::type(Nette\Utils\Html::class, $input->getControl());
 	Assert::same('<label for="frm-on"><input type="checkbox" name="on" id="frm-on">Label</label>', (string) $input->getControl());
 
-	Assert::type('Nette\Utils\Html', $input->getLabelPart());
+	Assert::type(Nette\Utils\Html::class, $input->getLabelPart());
 	Assert::same('<label for="frm-on">Label</label>', (string) $input->getLabelPart());
 
-	Assert::type('Nette\Utils\Html', $input->getControlPart());
+	Assert::type(Nette\Utils\Html::class, $input->getControlPart());
 	Assert::same('<input type="checkbox" name="on" id="frm-on">', (string) $input->getControlPart());
 
 	$input->setValue(TRUE);
diff --git a/tests/Forms/Controls.CheckboxList.loadData.phpt b/tests/Forms/Controls.CheckboxList.loadData.phpt
@@ -136,7 +136,7 @@ test(function () use ($series) { // setValue() and invalid argument
 
 	Assert::exception(function () use ($input) {
 		$input->setValue('unknown');
-	}, 'Nette\InvalidArgumentException', "Value 'unknown' are out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'list'.");
+	}, Nette\InvalidArgumentException::class, "Value 'unknown' are out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'list'.");
 });
 
 
diff --git a/tests/Forms/Controls.CheckboxList.render.phpt b/tests/Forms/Controls.CheckboxList.render.phpt
@@ -28,17 +28,17 @@ test(function () {
 		0 => 'Second',
 	]);
 
-	Assert::type('Nette\Utils\Html', $input->getLabel());
+	Assert::type(Nette\Utils\Html::class, $input->getLabel());
 	Assert::same('<label>Label</label>', (string) $input->getLabel());
 	Assert::same('<label>Another label</label>', (string) $input->getLabel('Another label'));
 
-	Assert::type('Nette\Utils\Html', $input->getLabelPart(0));
+	Assert::type(Nette\Utils\Html::class, $input->getLabelPart(0));
 	Assert::same('<label for="frm-list-0">Second</label>', (string) $input->getLabelPart(0));
 
 	Assert::type('string', $input->getControl());
 	Assert::same('<label><input type="checkbox" name="list[]" value="a">First</label><br><label><input type="checkbox" name="list[]" value="0">Second</label>', $input->getControl());
 
-	Assert::type('Nette\Utils\Html', $input->getControlPart(0));
+	Assert::type(Nette\Utils\Html::class, $input->getControlPart(0));
 	Assert::same('<input type="checkbox" name="list[]" id="frm-list-0" value="0">', (string) $input->getControlPart(0));
 });
 
diff --git a/tests/Forms/Controls.ChoiceControl.loadData.phpt b/tests/Forms/Controls.ChoiceControl.loadData.phpt
@@ -147,7 +147,7 @@ test(function () use ($series) { // setValue() and invalid argument
 
 	Assert::exception(function () use ($input) {
 		$input->setValue('unknown');
-	}, 'Nette\InvalidArgumentException', "Value 'unknown' is out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'select'.");
+	}, Nette\InvalidArgumentException::class, "Value 'unknown' is out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'select'.");
 });
 
 
diff --git a/tests/Forms/Controls.HiddenField.loadData.phpt b/tests/Forms/Controls.HiddenField.loadData.phpt
@@ -59,7 +59,7 @@ test(function () { // setValue() and invalid argument
 
 	Assert::exception(function () use ($input) {
 		$input->setValue([]);
-	}, 'Nette\InvalidArgumentException', "Value must be scalar or NULL, array given in field 'hidden'.");
+	}, Nette\InvalidArgumentException::class, "Value must be scalar or NULL, array given in field 'hidden'.");
 });
 
 
diff --git a/tests/Forms/Controls.HiddenField.render.phpt b/tests/Forms/Controls.HiddenField.render.phpt
@@ -26,7 +26,7 @@ test(function () {
 	$input = $form->addHidden('hidden', 'value');
 
 	Assert::null($input->getLabel());
-	Assert::type('Nette\Utils\Html', $input->getControl());
+	Assert::type(Nette\Utils\Html::class, $input->getControl());
 	Assert::same('<input type="hidden" name="hidden" value="value">', (string) $input->getControl());
 });
 
diff --git a/tests/Forms/Controls.ImageButton.render.phpt b/tests/Forms/Controls.ImageButton.render.phpt
@@ -26,7 +26,7 @@ test(function () {
 	$input = $form->addImage('button', 'image.gif');
 
 	Assert::null($input->getLabel());
-	Assert::type('Nette\Utils\Html', $input->getControl());
+	Assert::type(Nette\Utils\Html::class, $input->getControl());
 	Assert::same('<input type="image" name="button[]" src="image.gif">', (string) $input->getControl());
 });
 
diff --git a/tests/Forms/Controls.MultiChoiceControl.loadData.phpt b/tests/Forms/Controls.MultiChoiceControl.loadData.phpt
@@ -160,15 +160,15 @@ test(function () use ($series) { // setValue() and invalid argument
 
 	Assert::exception(function () use ($input) {
 		$input->setValue('unknown');
-	}, 'Nette\InvalidArgumentException', "Value 'unknown' are out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'select'.");
+	}, Nette\InvalidArgumentException::class, "Value 'unknown' are out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'select'.");
 
 	Assert::exception(function () use ($input) {
 		$input->setValue(new stdClass);
-	}, 'Nette\InvalidArgumentException', "Value must be array or NULL, object given in field 'select'.");
+	}, Nette\InvalidArgumentException::class, "Value must be array or NULL, object given in field 'select'.");
 
 	Assert::exception(function () use ($input) {
 		$input->setValue([new stdClass]);
-	}, 'Nette\InvalidArgumentException', "Values must be scalar, object given in field 'select'.");
+	}, Nette\InvalidArgumentException::class, "Values must be scalar, object given in field 'select'.");
 });
 
 
@@ -181,11 +181,11 @@ test(function () use ($series) { // setValue() and disabled $checkAllowedValues
 
 	Assert::exception(function () use ($input) {
 		$input->setValue(new stdClass);
-	}, 'Nette\InvalidArgumentException', "Value must be array or NULL, object given in field 'select'.");
+	}, Nette\InvalidArgumentException::class, "Value must be array or NULL, object given in field 'select'.");
 
 	Assert::exception(function () use ($input) {
 		$input->setValue([new stdClass]);
-	}, 'Nette\InvalidArgumentException', "Values must be scalar, object given in field 'select'.");
+	}, Nette\InvalidArgumentException::class, "Values must be scalar, object given in field 'select'.");
 });
 
 
diff --git a/tests/Forms/Controls.MultiSelectBox.loadData.phpt b/tests/Forms/Controls.MultiSelectBox.loadData.phpt
@@ -199,7 +199,7 @@ test(function () use ($series) { // setValue() and invalid argument
 
 	Assert::exception(function () use ($input) {
 		$input->setValue('unknown');
-	}, 'Nette\InvalidArgumentException', "Value 'unknown' are out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'select'.");
+	}, Nette\InvalidArgumentException::class, "Value 'unknown' are out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'select'.");
 });
 
 
diff --git a/tests/Forms/Controls.MultiSelectBox.render.phpt b/tests/Forms/Controls.MultiSelectBox.render.phpt
@@ -28,11 +28,11 @@ test(function () {
 		0 => 'Second',
 	]);
 
-	Assert::type('Nette\Utils\Html', $input->getLabel());
+	Assert::type(Nette\Utils\Html::class, $input->getLabel());
 	Assert::same('<label for="frm-list">Label</label>', (string) $input->getLabel());
 	Assert::same('<label for="frm-list">Another label</label>', (string) $input->getLabel('Another label'));
 
-	Assert::type('Nette\Utils\Html', $input->getControl());
+	Assert::type(Nette\Utils\Html::class, $input->getControl());
 	Assert::same('<select name="list[]" id="frm-list" multiple><option value="a">First</option><option value="0">Second</option></select>', (string) $input->getControl());
 });
 
diff --git a/tests/Forms/Controls.RadioList.loadData.phpt b/tests/Forms/Controls.RadioList.loadData.phpt
@@ -136,7 +136,7 @@ test(function () use ($series) { // setValue() and invalid argument
 
 	Assert::exception(function () use ($input) {
 		$input->setValue('unknown');
-	}, 'Nette\InvalidArgumentException', "Value 'unknown' is out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'radio'.");
+	}, Nette\InvalidArgumentException::class, "Value 'unknown' is out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'radio'.");
 });
 
 
diff --git a/tests/Forms/Controls.RadioList.render.phpt b/tests/Forms/Controls.RadioList.render.phpt
@@ -28,17 +28,17 @@ test(function () {
 		0 => 'Second',
 	]);
 
-	Assert::type('Nette\Utils\Html', $input->getLabel());
+	Assert::type(Nette\Utils\Html::class, $input->getLabel());
 	Assert::same('<label>Label</label>', (string) $input->getLabel());
 	Assert::same('<label>Another label</label>', (string) $input->getLabel('Another label'));
 
-	Assert::type('Nette\Utils\Html', $input->getLabelPart(0));
+	Assert::type(Nette\Utils\Html::class, $input->getLabelPart(0));
 	Assert::same('<label for="frm-list-0">Second</label>', (string) $input->getLabelPart(0));
 
-	Assert::type('Nette\Utils\Html', $input->getControl());
+	Assert::type(Nette\Utils\Html::class, $input->getControl());
 	Assert::same('<label><input type="radio" name="list" value="a">First</label><br><label><input type="radio" name="list" value="0">Second</label>', (string) $input->getControl());
 
-	Assert::type('Nette\Utils\Html', $input->getControlPart(0));
+	Assert::type(Nette\Utils\Html::class, $input->getControlPart(0));
 	Assert::same('<input type="radio" name="list" id="frm-list-0" value="0">', (string) $input->getControlPart(0));
 });
 
diff --git a/tests/Forms/Controls.SelectBox.loadData.phpt b/tests/Forms/Controls.SelectBox.loadData.phpt
@@ -222,7 +222,7 @@ test(function () use ($series) { // setValue() and invalid argument
 
 	Assert::exception(function () use ($input) {
 		$input->setValue('unknown');
-	}, 'Nette\InvalidArgumentException', "Value 'unknown' is out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'select'.");
+	}, Nette\InvalidArgumentException::class, "Value 'unknown' is out of allowed set ['red-dwarf', 'the-simpsons', 0, ''] in field 'select'.");
 });
 
 
diff --git a/tests/Forms/Controls.SelectBox.render.phpt b/tests/Forms/Controls.SelectBox.render.phpt
@@ -28,11 +28,11 @@ test(function () {
 		0 => 'Second',
 	]);
 
-	Assert::type('Nette\Utils\Html', $input->getLabel());
+	Assert::type(Nette\Utils\Html::class, $input->getLabel());
 	Assert::same('<label for="frm-list">Label</label>', (string) $input->getLabel());
 	Assert::same('<label for="frm-list">Another label</label>', (string) $input->getLabel('Another label'));
 
-	Assert::type('Nette\Utils\Html', $input->getControl());
+	Assert::type(Nette\Utils\Html::class, $input->getControl());
 	Assert::same('<select name="list" id="frm-list"><option value="a">First</option><option value="0">Second</option></select>', (string) $input->getControl());
 });
 
diff --git a/tests/Forms/Controls.TextArea.render.phpt b/tests/Forms/Controls.TextArea.render.phpt
diff --git a/tests/Forms/Controls.TextBase.loadData.phpt b/tests/Forms/Controls.TextBase.loadData.phpt
diff --git a/tests/Forms/Controls.TextInput.render.phpt b/tests/Forms/Controls.TextInput.render.phpt
diff --git a/tests/Forms/Controls.UploadControl.render.phpt b/tests/Forms/Controls.UploadControl.render.phpt
diff --git a/tests/Forms/Helpers.createSelectBox.phpt b/tests/Forms/Helpers.createSelectBox.phpt

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`}`
`15`	`15`	`],`
`16`	`16`	`"require": {`
`17`		`- "php": ">=5.4.4",`
	`17`	`+ "php": ">=5.6.0",`
`18`	`18`	`"nette/component-model": "~2.2",`
`19`	`19`	`"nette/http": "~2.2",`
`20`	`20`	`"nette/utils": "~2.2"`
Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,13 @@ public static function renderFormEnd(Form $form, $withTags = TRUE)`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`- foreach ($form->getComponents(TRUE, 'Nette\Forms\Controls\HiddenField') as $control) {`
	`59`	`+ foreach ($form->getComponents(TRUE, Nette\Forms\Controls\HiddenField::class) as $control) {`
`60`	`60`	`if (!$control->getOption('rendered')) {`
`61`	`61`	`$s .= $control->getControl();`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- if (iterator_count($form->getComponents(TRUE, 'Nette\Forms\Controls\TextInput')) < 2) {`
	`65`	`+ if (iterator_count($form->getComponents(TRUE, Nette\Forms\Controls\TextInput::class)) < 2) {`
`66`	`66`	`$s .= "<!--[if IE]><input type=IEbug disabled style=\"display:none\"><![endif]-->\n";`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ public function addComponent(Nette\ComponentModel\IComponent $component, $name,`
`207`	`207`	`*/`
`208`	`208`	`public function getControls()`
`209`	`209`	`{`
`210`		`- return $this->getComponents(TRUE, 'Nette\Forms\IControl');`
	`210`	`+ return $this->getComponents(TRUE, IControl::class);`
`211`	`211`	`}`
`212`	`212`
`213`	`213`
`@@ -218,7 +218,7 @@ public function getControls()`
`218`	`218`	`*/`
`219`	`219`	`public function getForm($need = TRUE)`
`220`	`220`	`{`
`221`		`- return $this->lookup('Nette\Forms\Form', $need);`
	`221`	`+ return $this->lookup(Form::class, $need);`
`222`	`222`	`}`
`223`	`223`
`224`	`224`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ abstract class BaseControl extends Nette\ComponentModel\Component implements ICo`
`75`	`75`	`*/`
`76`	`76`	`public function __construct($caption = NULL)`
`77`	`77`	`{`
`78`		`- $this->monitor('Nette\Forms\Form');`
	`78`	`+ $this->monitor(Form::class);`
`79`	`79`	`parent::__construct();`
`80`	`80`	`$this->control = Html::el('input', ['type' => NULL, 'name' => NULL]);`
`81`	`81`	`$this->label = Html::el('label');`
`@@ -105,7 +105,7 @@ protected function attached($form)`
`105`	`105`	`*/`
`106`	`106`	`public function getForm($need = TRUE)`
`107`	`107`	`{`
`108`		`- return $this->lookup('Nette\Forms\Form', $need);`
	`108`	`+ return $this->lookup(Form::class, $need);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`
`@@ -135,7 +135,7 @@ public function getHttpData($type, $htmlTail = NULL)`
`135`	`135`	`*/`
`136`	`136`	`public function getHtmlName()`
`137`	`137`	`{`
`138`		`- return Nette\Forms\Helpers::generateHtmlName($this->lookupPath('Nette\Forms\Form'));`
	`138`	`+ return Nette\Forms\Helpers::generateHtmlName($this->lookupPath(Form::class));`
`139`	`139`	`}`
`140`	`140`
`141`	`141`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct($message)`
`29`	`29`	`{`
`30`	`30`	`parent::__construct();`
`31`	`31`	`$this->setOmitted()->addRule(self::PROTECTION, $message);`
`32`		`- $this->monitor('Nette\Application\UI\Presenter');`
	`32`	`+ $this->monitor(Nette\Application\UI\Presenter::class);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public function __construct($persistentValue = NULL)`
`24`	`24`	`parent::__construct();`
`25`	`25`	`$this->control->type = 'hidden';`
`26`	`26`	`if ($persistentValue !== NULL) {`
`27`		`- $this->unmonitor('Nette\Forms\Form');`
	`27`	`+ $this->unmonitor(Nette\Forms\Form::class);`
`28`	`28`	`$this->persistValue = TRUE;`
`29`	`29`	`$this->value = (string) $persistentValue;`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public function getControl($caption = NULL)`
`112`	`112`	`{`
`113`	`113`	`$scope = [];`
`114`	`114`	`foreach ((array) $this->validationScope as $control) {`
`115`		`- $scope[] = $control->lookupPath('Nette\Forms\Form');`
	`115`	`+ $scope[] = $control->lookupPath(Nette\Forms\Form::class);`
`116`	`116`	`}`
`117`	`117`	`return parent::getControl($caption)->addAttributes([`
`118`	`118`	`'formnovalidate' => $this->validationScope !== NULL,`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public function renderEnd()`
`193`	`193`	`$s .= $control->getControl();`
`194`	`194`	`}`
`195`	`195`	`}`
`196`		`- if (iterator_count($this->form->getComponents(TRUE, 'Nette\Forms\Controls\TextInput')) < 2) {`
	`196`	`+ if (iterator_count($this->form->getComponents(TRUE, Nette\Forms\Controls\TextInput::class)) < 2) {`
`197`	`197`	`$s .= '<!--[if IE]><input type=IEbug disabled style="display:none"><![endif]-->';`
`198`	`198`	`}`
`199`	`199`	`if ($s) {`