coding style: fixes in code

Author: dg

examples/custom-control.php

@@ -19,10 +19,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

@@ -21,7 +21,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

@@ -24,7 +24,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

@@ -207,7 +207,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/Container.php

@@ -21,15 +21,15 @@
  */
 class Container extends Nette\ComponentModel\Container implements \ArrayAccess
 {
-	/** @var callable[]  extension methods */
-	private static $extMethods = [];
-
 	/** @var callable[]  function (Container $sender); Occurs when the form is validated */
 	public $onValidate;
 
 	/** @var ControlGroup|null */
 	protected $currentGroup;
 
+	/** @var callable[]  extension methods */
+	private static $extMethods = [];
+
 	/** @var bool */
 	private $validated;
 

src/Forms/Controls/BaseControl.php

@@ -41,12 +41,6 @@ abstract class BaseControl extends Nette\ComponentModel\Component implements ICo
 	/** @var string */
 	public static $idMask = 'frm-%s';
 
-	/** @var callable[][]  extension methods */
-	private static $extMethods = [];
-
-	/** @var string|object textual caption or label */
-	private $caption;
-
 	/** @var mixed current control value */
 	protected $value;
 
@@ -56,12 +50,18 @@ 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 callable[][]  extension methods */
+	private static $extMethods = [];
+
+	/** @var string|object textual caption or label */
+	private $caption;
+
+	/** @var array */
+	private $errors = [];
+
 	/** @var bool|null */
 	private $omitted;
 

src/Forms/Form.php

@@ -92,6 +92,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;
 
@@ -113,9 +116,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;
 
@@ -629,7 +629,7 @@ public function __toString(): string
 			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

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

tests/Forms.Latte/FormMacros.forms.phpt

@@ -16,13 +16,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

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