coding style: fixes in code

Author: dg

examples/custom-control.php

@@ -17,10 +17,9 @@
 class DateInput extends Nette\Forms\Controls\BaseControl
 {
 	/** @var string */
-	private
-		$day = '',
-		$month = '',
-		$year = '';
+	private $day = '';
+	private $month = '';
+	private $year = '';
 
 
 	public function __construct($label = null)

examples/custom-validator.php

@@ -19,7 +19,7 @@
 // Define custom validator
 class MyValidators
 {
-	static function divisibilityValidator($item, $arg)
+	public static function divisibilityValidator($item, $arg)
 	{
 		return $item->value % $arg === 0;
 	}

examples/localization.php

@@ -22,7 +22,7 @@ class MyTranslator implements Nette\Localization\ITranslator
 	private $table;
 
 
-	function __construct(array $table)
+	public function __construct(array $table)
 	{
 		$this->table = $table;
 	}

src/Bridges/FormsLatte/FormMacros.php

@@ -205,7 +205,7 @@ public function macroNameEnd(MacroNode $node, PhpWriter $writer)
 			$node->innerContent .= '<?php echo Nette\Bridges\FormsLatte\Runtime::renderFormEnd(array_pop($this->global->formsStack), false); ?>';
 		} elseif ($tagName === 'label') {
 			if ($node->htmlNode->empty) {
-				$node->innerContent = "<?php echo \$_input->getLabelPart()->getHtml() ?>";
+				$node->innerContent = '<?php echo $_input->getLabelPart()->getHtml() ?>';
 			}
 		} elseif ($tagName === 'button') {
 			if ($node->htmlNode->empty) {

src/Forms/Controls/BaseControl.php

@@ -50,12 +50,12 @@ abstract class BaseControl extends Nette\ComponentModel\Component implements ICo
 	/** @var Html  label element template */
 	protected $label;
 
-	/** @var array */
-	private $errors = [];
-
 	/** @var bool */
 	protected $disabled = false;
 
+	/** @var array */
+	private $errors = [];
+
 	/** @var bool|null */
 	private $omitted;
 

src/Forms/Form.php

@@ -93,6 +93,9 @@ class Form extends Container implements Nette\Utils\IHtmlString
 	/** @var callable[]  function (Form $sender); Occurs before the form is rendered */
 	public $onRender;
 
+	/** @var Nette\Http\IRequest  used only by standalone form */
+	public $httpRequest;
+
 	/** @var mixed or null meaning: not detected yet */
 	private $submittedBy;
 
@@ -114,9 +117,6 @@ class Form extends Container implements Nette\Utils\IHtmlString
 	/** @var array */
 	private $errors = [];
 
-	/** @var Nette\Http\IRequest  used only by standalone form */
-	public $httpRequest;
-
 	/** @var bool */
 	private $beforeRenderCalled;
 
@@ -667,14 +667,14 @@ public function __toString()
 			$this->fireRenderEvents();
 			return $this->getRenderer()->render($this);
 
-		} catch (\Throwable $e) {
 		} catch (\Exception $e) {
+		} catch (\Throwable $e) {
 		}
 		if (isset($e)) {
 			if (func_num_args()) {
 				throw $e;
 			}
-			trigger_error("Exception in " . __METHOD__ . "(): {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}", E_USER_ERROR);
+			trigger_error('Exception in ' . __METHOD__ . "(): {$e->getMessage()} in {$e->getFile()}:{$e->getLine()}", E_USER_ERROR);
 		}
 	}
 

src/Forms/Rendering/DefaultFormRenderer.php

@@ -54,7 +54,6 @@ class DefaultFormRenderer implements Nette\Forms\IFormRenderer
 	 *      \---
 	 *    \---
 	 *  \--
-	 *
 	 * @var array of HTML tags */
 	public $wrappers = [
 		'form' => [

src/Forms/Rules.php

@@ -344,4 +344,4 @@ private static function getCallback(Rule $rule)
 	}
 }
 
-Rules::$defaultMessages = & Validator::$messages;
+Rules::$defaultMessages = &Validator::$messages;

tests/Forms.Latte/FormMacros.forms.phpt

@@ -14,13 +14,13 @@ require __DIR__ . '/../bootstrap.php';
 
 class MyControl extends Nette\Forms\Controls\BaseControl
 {
-	function getLabel($c = null)
+	public function getLabel($c = null)
 	{
 		return '<label>My</label>';
 	}
 
 
-	function getControl()
+	public function getControl()
 	{
 		return '<input name=My>';
 	}

tests/Forms/Controls.Button.render.phpt

@@ -14,7 +14,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements Nette\Localization\ITranslator
 {
-	function translate($s, $plural = null)
+	public function translate($s, $plural = null)
 	{
 		return strtoupper($s);
 	}