coding style: fixed spaces & use statements order

dg · dg · commit 318c6b03c341 · 2017-07-11T14:00:16.000+02:00
diff --git a/examples/basic-example.php b/examples/basic-example.php
@@ -12,9 +12,9 @@
 }
 
 use Nette\Forms\Form;
+use Nette\Utils\Html;
 use Tracy\Debugger;
 use Tracy\Dumper;
-use Nette\Utils\Html;
 
 Debugger::enable();
 
diff --git a/examples/custom-control.php b/examples/custom-control.php
@@ -12,8 +12,8 @@
 }
 
 use Nette\Forms\Form;
-use Nette\Utils\Html;
 use Nette\Forms\Helpers;
+use Nette\Utils\Html;
 
 
 class DateInput extends Nette\Forms\Controls\BaseControl
@@ -115,7 +115,6 @@ public static function validateDate(Nette\Forms\IControl $control)
 			&& ctype_digit($control->year)
 			&& checkdate((int) $control->month, (int) $control->day, (int) $control->year);
 	}
-
 }
 
 
diff --git a/examples/custom-rendering.php b/examples/custom-rendering.php
@@ -12,9 +12,9 @@
 }
 
 use Nette\Forms\Form;
+use Nette\Utils\Html;
 use Tracy\Debugger;
 use Tracy\Dumper;
-use Nette\Utils\Html;
 
 Debugger::enable();
 
diff --git a/examples/localization.php b/examples/localization.php
@@ -23,11 +23,13 @@ class MyTranslator implements Nette\Localization\ITranslator
 {
 	private $table;
 
+
 	function __construct(array $table)
 	{
 		$this->table = $table;
 	}
 
+
 	/**
 	 * Translates the given string.
 	 */
diff --git a/src/Bridges/FormsDI/FormsExtension.php b/src/Bridges/FormsDI/FormsExtension.php
@@ -37,5 +37,4 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 			}
 		}
 	}
-
 }
diff --git a/src/Bridges/FormsLatte/FormMacros.php b/src/Bridges/FormsLatte/FormMacros.php
@@ -9,12 +9,12 @@
 
 namespace Nette\Bridges\FormsLatte;
 
-use Nette;
 use Latte;
-use Latte\MacroNode;
-use Latte\PhpWriter;
 use Latte\CompileException;
+use Latte\MacroNode;
 use Latte\Macros\MacroSet;
+use Latte\PhpWriter;
+use Nette;
 use Nette\Forms\Form;
 
 
@@ -29,7 +29,6 @@
  */
 class FormMacros extends MacroSet
 {
-
 	public static function install(Latte\Compiler $compiler)
 	{
 		$me = new static($compiler);
@@ -238,5 +237,4 @@ public function macroInputError(MacroNode $node, PhpWriter $writer)
 			return $writer->write('echo %escape(end($this->global->formsStack)[%0.word]->getError());', $name);
 		}
 	}
-
 }
diff --git a/src/Bridges/FormsLatte/Runtime.php b/src/Bridges/FormsLatte/Runtime.php
@@ -10,8 +10,8 @@
 namespace Nette\Bridges\FormsLatte;
 
 use Nette;
-use Nette\Utils\Html;
 use Nette\Forms\Form;
+use Nette\Utils\Html;
 
 
 /**
@@ -70,5 +70,4 @@ public static function renderFormEnd(Form $form, bool $withTags = TRUE): string
 
 		return $s . ($withTags ? $form->getElementPrototype()->endTag() . "\n" : '');
 	}
-
 }
diff --git a/src/Forms/Container.php b/src/Forms/Container.php
@@ -488,5 +488,4 @@ public function __clone()
 	{
 		throw new Nette\NotImplementedException('Form cloning is not supported yet.');
 	}
-
 }
diff --git a/src/Forms/ControlGroup.php b/src/Forms/ControlGroup.php
@@ -122,5 +122,4 @@ public function getOptions(): array
 	{
 		return $this->options;
 	}
-
 }
diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
@@ -606,5 +606,4 @@ public static function extensionMethod($name, /*callable*/ $callback): void
 		}
 		self::$extMethods[$name][static::class] = $callback;
 	}
-
 }
diff --git a/src/Forms/Controls/Button.php b/src/Forms/Controls/Button.php
@@ -61,5 +61,4 @@ public function getControl($caption = NULL): Nette\Utils\Html
 			'value' => $this->translate($caption === NULL ? $this->getCaption() : $caption),
 		]);
 	}
-
 }
diff --git a/src/Forms/Controls/Checkbox.php b/src/Forms/Controls/Checkbox.php
@@ -94,5 +94,4 @@ public function getSeparatorPrototype(): Html
 	{
 		return $this->wrapper;
 	}
-
 }
diff --git a/src/Forms/Controls/CheckboxList.php b/src/Forms/Controls/CheckboxList.php
@@ -129,5 +129,4 @@ public function getItemLabelPrototype(): Html
 	{
 		return $this->itemLabel;
 	}
-
 }
diff --git a/src/Forms/Controls/ChoiceControl.php b/src/Forms/Controls/ChoiceControl.php
@@ -147,5 +147,4 @@ public function setDisabled($value = TRUE)
 		}
 		return $this;
 	}
-
 }
diff --git a/src/Forms/Controls/CsrfProtection.php b/src/Forms/Controls/CsrfProtection.php
@@ -112,5 +112,4 @@ private function getSession(): Nette\Http\Session
 		}
 		return $this->session;
 	}
-
 }
diff --git a/src/Forms/Controls/HiddenField.php b/src/Forms/Controls/HiddenField.php
@@ -83,5 +83,4 @@ public function addError($message): void
 	{
 		$this->getForm()->addError($message);
 	}
-
 }
diff --git a/src/Forms/Controls/ImageButton.php b/src/Forms/Controls/ImageButton.php
@@ -48,5 +48,4 @@ public function getHtmlName(): string
 	{
 		return parent::getHtmlName() . '[]';
 	}
-
 }
diff --git a/src/Forms/Controls/MultiChoiceControl.php b/src/Forms/Controls/MultiChoiceControl.php
@@ -159,5 +159,4 @@ public function getHtmlName(): string
 	{
 		return parent::getHtmlName() . '[]';
 	}
-
 }
diff --git a/src/Forms/Controls/MultiSelectBox.php b/src/Forms/Controls/MultiSelectBox.php
@@ -84,5 +84,4 @@ public function addOptionAttributes(array $attributes)
 		$this->optionAttributes = $attributes + $this->optionAttributes;
 		return $this;
 	}
-
 }
diff --git a/src/Forms/Controls/RadioList.php b/src/Forms/Controls/RadioList.php
@@ -135,5 +135,4 @@ public function getItemLabelPrototype(): Html
 	{
 		return $this->itemLabel;
 	}
-
 }
diff --git a/src/Forms/Controls/SelectBox.php b/src/Forms/Controls/SelectBox.php
@@ -124,5 +124,4 @@ public function isOk(): bool
 			|| !$this->options
 			|| $this->control->size > 1;
 	}
-
 }
diff --git a/src/Forms/Controls/SubmitButton.php b/src/Forms/Controls/SubmitButton.php
@@ -115,5 +115,4 @@ public function getControl($caption = NULL): Nette\Utils\Html
 			'data-nette-validation-scope' => $scope ?: NULL,
 		]);
 	}
-
 }
diff --git a/src/Forms/Controls/TextArea.php b/src/Forms/Controls/TextArea.php
@@ -37,5 +37,4 @@ public function getControl(): Nette\Utils\Html
 		return parent::getControl()
 			->setText($this->getRenderedValue());
 	}
-
 }
diff --git a/src/Forms/Controls/TextBase.php b/src/Forms/Controls/TextBase.php
@@ -145,5 +145,4 @@ public function addRule($validator, $errorMessage = NULL, $arg = NULL)
 		}
 		return parent::addRule($validator, $errorMessage, $arg);
 	}
-
 }
diff --git a/src/Forms/Controls/TextInput.php b/src/Forms/Controls/TextInput.php
@@ -106,5 +106,4 @@ public function addRule($validator, $errorMessage = NULL, $arg = NULL)
 
 		return parent::addRule($validator, $errorMessage, $arg);
 	}
-
 }
diff --git a/src/Forms/Controls/UploadControl.php b/src/Forms/Controls/UploadControl.php
@@ -22,6 +22,7 @@ class UploadControl extends BaseControl
 	/** validation rule */
 	public const VALID = ':uploadControlValid';
 
+
 	/**
 	 * @param  string|object
 	 */
@@ -105,5 +106,4 @@ public function isOk(): bool
 				return $carry && $fileUpload->isOk();
 			}, TRUE);
 	}
-
 }
diff --git a/src/Forms/Form.php b/src/Forms/Form.php
@@ -655,5 +655,4 @@ public function getToggles(): array
 		}
 		return $toggles;
 	}
-
 }
diff --git a/src/Forms/Helpers.php b/src/Forms/Helpers.php
@@ -10,8 +10,8 @@
 namespace Nette\Forms;
 
 use Nette;
-use Nette\Utils\Strings;
 use Nette\Utils\Html;
+use Nette\Utils\Strings;
 
 
 /**
@@ -220,5 +220,4 @@ private static function prepareAttrs(?array $attrs, string $name): array
 		}
 		return [$dynamic, '<' . $name . Html::el(NULL, $attrs)->attributes()];
 	}
-
 }
diff --git a/src/Forms/IControl.php b/src/Forms/IControl.php
@@ -40,5 +40,4 @@ function getErrors(): array;
 	 * Is control value excluded from $form->getValues() result?
 	 */
 	function isOmitted(): bool;
-
 }
diff --git a/src/Forms/IFormRenderer.php b/src/Forms/IFormRenderer.php
@@ -20,5 +20,4 @@ interface IFormRenderer
 	 * Provides complete form rendering.
 	 */
 	function render(Form $form): string;
-
 }
diff --git a/src/Forms/ISubmitterControl.php b/src/Forms/ISubmitterControl.php
@@ -20,5 +20,4 @@ interface ISubmitterControl extends IControl
 	 * Gets the validation scope. Clicking the button validates only the controls within the specified scope.
 	 */
 	function getValidationScope(): ?array;
-
 }
diff --git a/src/Forms/Rendering/DefaultFormRenderer.php b/src/Forms/Rendering/DefaultFormRenderer.php
@@ -474,5 +474,4 @@ protected function getValue(string $name)
 		$data = &$this->wrappers[$name[0]][$name[1]];
 		return $data;
 	}
-
 }
diff --git a/src/Forms/Rule.php b/src/Forms/Rule.php
@@ -36,5 +36,4 @@ class Rule
 
 	/** @var Rules  for conditions */
 	public $branch;
-
 }
diff --git a/src/Forms/Rules.php b/src/Forms/Rules.php
@@ -322,5 +322,4 @@ private static function getCallback(Rule $rule)
 			return $op;
 		}
 	}
-
 }
diff --git a/src/Forms/Validator.php b/src/Forms/Validator.php
@@ -330,5 +330,4 @@ private static function toArray($value): array
 	{
 		return $value instanceof Nette\Http\FileUpload ? [$value] : (array) $value;
 	}
-
 }
diff --git a/tests/Forms.DI/FormsExtension.phpt b/tests/Forms.DI/FormsExtension.phpt
@@ -6,10 +6,10 @@
 
 declare(strict_types=1);
 
+use Nette\Bridges\FormsDI\FormsExtension;
 use Nette\DI;
-use Nette\Forms\Validator;
 use Nette\Forms\Form;
-use Nette\Bridges\FormsDI\FormsExtension;
+use Nette\Forms\Validator;
 use Tester\Assert;
 
 
diff --git a/tests/Forms.Latte/FormMacros.button.phpt b/tests/Forms.Latte/FormMacros.button.phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Nette\Forms\Form;
 use Nette\Bridges\FormsLatte\FormMacros;
+use Nette\Forms\Form;
 use Tester\Assert;
 
 
diff --git a/tests/Forms.Latte/FormMacros.error.phpt b/tests/Forms.Latte/FormMacros.error.phpt
@@ -6,7 +6,6 @@
 
 declare(strict_types=1);
 
-use Nette\Forms\Form;
 use Nette\Bridges\FormsLatte\FormMacros;
 use Tester\Assert;
 
diff --git a/tests/Forms.Latte/FormMacros.formContainer.phpt b/tests/Forms.Latte/FormMacros.formContainer.phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Nette\Forms\Form;
 use Nette\Bridges\FormsLatte\FormMacros;
+use Nette\Forms\Form;
 use Tester\Assert;
 
 
diff --git a/tests/Forms.Latte/FormMacros.forms.phpt b/tests/Forms.Latte/FormMacros.forms.phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Nette\Forms\Form;
 use Nette\Bridges\FormsLatte\FormMacros;
+use Nette\Forms\Form;
 use Tester\Assert;
 
 
@@ -21,6 +21,7 @@ class MyControl extends Nette\Forms\Controls\BaseControl
 		return '<label>My</label>';
 	}
 
+
 	function getControl()
 	{
 		return '<input name=My>';
diff --git a/tests/Forms.Latte/FormMacros.get.phpt b/tests/Forms.Latte/FormMacros.get.phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Nette\Forms\Form;
 use Nette\Bridges\FormsLatte\FormMacros;
+use Nette\Forms\Form;
 use Tester\Assert;
 
 
diff --git a/tests/Forms/BaseControl.extensionMethod.phpt b/tests/Forms/BaseControl.extensionMethod.phpt
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
+use Nette\Forms\Controls\Button;
+use Nette\Forms\Controls\Checkbox;
 use Nette\Forms\Controls\TextBase;
 use Nette\Forms\Controls\TextInput;
-use Nette\Forms\Controls\Checkbox;
-use Nette\Forms\Controls\Button;
 use Tester\Assert;
 
 
diff --git a/tests/Forms/Container.validate().phpt b/tests/Forms/Container.validate().phpt
@@ -6,8 +6,8 @@
 
 declare(strict_types=1);
 
-use Nette\Forms\Form;
 use Nette\Forms\Container;
+use Nette\Forms\Form;
 use Tester\Assert;
 
 
diff --git a/tests/Forms/Container.values.phpt b/tests/Forms/Container.values.phpt
@@ -6,7 +6,6 @@
 
 declare(strict_types=1);
 
-use Nette\Http;
 use Nette\Forms\Form;
 use Nette\Utils\ArrayHash;
 use Tester\Assert;
diff --git a/tests/Forms/ControlGroup.phpt b/tests/Forms/ControlGroup.phpt
diff --git a/tests/Forms/Controls.ChoiceControl.loadData.phpt b/tests/Forms/Controls.ChoiceControl.loadData.phpt
diff --git a/tests/Forms/Controls.CsrfProtection.breachAttack.phpt b/tests/Forms/Controls.CsrfProtection.breachAttack.phpt
diff --git a/tests/Forms/Controls.MultiChoiceControl.loadData.phpt b/tests/Forms/Controls.MultiChoiceControl.loadData.phpt
diff --git a/tests/Forms/Controls.SelectBox.isOk.phpt b/tests/Forms/Controls.SelectBox.isOk.phpt
diff --git a/tests/Forms/Controls.UploadControl.loadData.phpt b/tests/Forms/Controls.UploadControl.loadData.phpt
diff --git a/tests/Forms/Controls.translate().phpt b/tests/Forms/Controls.translate().phpt
diff --git a/tests/Forms/Forms.callbackParameters.phpt b/tests/Forms/Forms.callbackParameters.phpt
diff --git a/tests/Forms/Forms.omittedValue.phpt b/tests/Forms/Forms.omittedValue.phpt
diff --git a/tests/Forms/Forms.onClick.phpt b/tests/Forms/Forms.onClick.phpt
diff --git a/tests/Forms/Forms.renderer.2.phpt b/tests/Forms/Forms.renderer.2.phpt
diff --git a/tests/Forms/Forms.renderer.5.phpt b/tests/Forms/Forms.renderer.5.phpt
diff --git a/tests/Forms/Forms.userValidator.phpt b/tests/Forms/Forms.userValidator.phpt
diff --git a/tests/Forms/Forms.validationScope.phpt b/tests/Forms/Forms.validationScope.phpt
diff --git a/tests/Forms/Helpers.exportRules.phpt b/tests/Forms/Helpers.exportRules.phpt
diff --git a/tests/Forms/Helpers.generateHtmlName.phpt b/tests/Forms/Helpers.generateHtmlName.phpt
diff --git a/tests/Forms/Rules.dynamic.phpt b/tests/Forms/Rules.dynamic.phpt
diff --git a/tests/Forms/Rules.required.phpt b/tests/Forms/Rules.required.phpt

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`use Nette\Forms\Form;`
	`15`	`+use Nette\Utils\Html;`
`15`	`16`	`use Tracy\Debugger;`
`16`	`17`	`use Tracy\Dumper;`
`17`		`-use Nette\Utils\Html;`
`18`	`18`
`19`	`19`	`Debugger::enable();`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`use Nette\Forms\Form;`
`15`		`-use Nette\Utils\Html;`
`16`	`15`	`use Nette\Forms\Helpers;`
	`16`	`+use Nette\Utils\Html;`
`17`	`17`
`18`	`18`
`19`	`19`	`class DateInput extends Nette\Forms\Controls\BaseControl`
`@@ -115,7 +115,6 @@ public static function validateDate(Nette\Forms\IControl $control)`
`115`	`115`	`&& ctype_digit($control->year)`
`116`	`116`	`&& checkdate((int) $control->month, (int) $control->day, (int) $control->year);`
`117`	`117`	`}`
`118`		`-`
`119`	`118`	`}`
`120`	`119`
`121`	`120`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,13 @@ class MyTranslator implements Nette\Localization\ITranslator`
`23`	`23`	`{`
`24`	`24`	`private $table;`
`25`	`25`
	`26`	`+`
`26`	`27`	`function __construct(array $table)`
`27`	`28`	`{`
`28`	`29`	`$this->table = $table;`
`29`	`30`	`}`
`30`	`31`
	`32`	`+`
`31`	`33`	`/**`
`32`	`34`	`* Translates the given string.`
`33`	`35`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,4 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
`40`		`-`
`41`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,12 @@`
`9`	`9`
`10`	`10`	`namespace Nette\Bridges\FormsLatte;`
`11`	`11`
`12`		`-use Nette;`
`13`	`12`	`use Latte;`
`14`		`-use Latte\MacroNode;`
`15`		`-use Latte\PhpWriter;`
`16`	`13`	`use Latte\CompileException;`
	`14`	`+use Latte\MacroNode;`
`17`	`15`	`use Latte\Macros\MacroSet;`
	`16`	`+use Latte\PhpWriter;`
	`17`	`+use Nette;`
`18`	`18`	`use Nette\Forms\Form;`
`19`	`19`
`20`	`20`
`@@ -29,7 +29,6 @@`
`29`	`29`	`*/`
`30`	`30`	`class FormMacros extends MacroSet`
`31`	`31`	`{`
`32`		`-`
`33`	`32`	`public static function install(Latte\Compiler $compiler)`
`34`	`33`	`{`
`35`	`34`	`$me = new static($compiler);`
`@@ -238,5 +237,4 @@ public function macroInputError(MacroNode $node, PhpWriter $writer)`
`238`	`237`	`return $writer->write('echo %escape(end($this->global->formsStack)[%0.word]->getError());', $name);`
`239`	`238`	`}`
`240`	`239`	`}`
`241`		`-`
`242`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`namespace Nette\Bridges\FormsLatte;`
`11`	`11`
`12`	`12`	`use Nette;`
`13`		`-use Nette\Utils\Html;`
`14`	`13`	`use Nette\Forms\Form;`
	`14`	`+use Nette\Utils\Html;`
`15`	`15`
`16`	`16`
`17`	`17`	`/**`
`@@ -70,5 +70,4 @@ public static function renderFormEnd(Form $form, bool $withTags = TRUE): string`
`70`	`70`
`71`	`71`	`return $s . ($withTags ? $form->getElementPrototype()->endTag() . "\n" : '');`
`72`	`72`	`}`
`73`		`-`
`74`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -488,5 +488,4 @@ public function __clone()`
`488`	`488`	`{`
`489`	`489`	`throw new Nette\NotImplementedException('Form cloning is not supported yet.');`
`490`	`490`	`}`
`491`		`-`
`492`	`491`	`}`
Original file line number	Diff line number	Diff line change
`@@ -122,5 +122,4 @@ public function getOptions(): array`
`122`	`122`	`{`
`123`	`123`	`return $this->options;`
`124`	`124`	`}`
`125`		`-`
`126`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -606,5 +606,4 @@ public static function extensionMethod($name, /callable/ $callback): void`
`606`	`606`	`}`
`607`	`607`	`self::$extMethods[$name][static::class] = $callback;`
`608`	`608`	`}`
`609`		`-`
`610`	`609`	`}`