coding style: fixes in code

nette · Jul 13, 2017 · 85eedf2 · 85eedf2
1 parent f59098e
commit 85eedf2
Show file tree

Hide file tree

Showing 26 changed files with 34 additions and 36 deletions.
diff --git a/examples/custom-control.php b/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)

diff --git a/examples/custom-validator.php b/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;
 	}

diff --git a/examples/localization.php b/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;
 	}

diff --git a/src/Bridges/FormsLatte/FormMacros.php b/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) {

diff --git a/src/Forms/Controls/BaseControl.php b/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;
 

diff --git a/src/Forms/Form.php b/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);
 		}
 	}
 

diff --git a/src/Forms/Rendering/DefaultFormRenderer.php b/src/Forms/Rendering/DefaultFormRenderer.php
@@ -54,7 +54,6 @@ class DefaultFormRenderer implements Nette\Forms\IFormRenderer
 	 *      \---
 	 *    \---
 	 *  \--
-	 *
 	 * @var array of HTML tags */
 	public $wrappers = [
 		'form' => [

diff --git a/src/Forms/Rules.php b/src/Forms/Rules.php
@@ -344,4 +344,4 @@ private static function getCallback(Rule $rule)
 	}
 }
 
-Rules::$defaultMessages = & Validator::$messages;
+Rules::$defaultMessages = &Validator::$messages;
diff --git a/tests/Forms.Latte/FormMacros.forms.phpt b/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>';
 	}

diff --git a/tests/Forms/Controls.Button.render.phpt b/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);
 	}

diff --git a/tests/Forms/Controls.Checkbox.render.phpt b/tests/Forms/Controls.Checkbox.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);
 	}

diff --git a/tests/Forms/Controls.CheckboxList.render.phpt b/tests/Forms/Controls.CheckboxList.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);
 	}

diff --git a/tests/Forms/Controls.HiddenField.render.phpt b/tests/Forms/Controls.HiddenField.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);
 	}

diff --git a/tests/Forms/Controls.ImageButton.render.phpt b/tests/Forms/Controls.ImageButton.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);
 	}

diff --git a/tests/Forms/Controls.MultiSelectBox.render.phpt b/tests/Forms/Controls.MultiSelectBox.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);
 	}

diff --git a/tests/Forms/Controls.RadioList.render.phpt b/tests/Forms/Controls.RadioList.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);
 	}

diff --git a/tests/Forms/Controls.SelectBox.render.phpt b/tests/Forms/Controls.SelectBox.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);
 	}

diff --git a/tests/Forms/Controls.TextArea.render.phpt b/tests/Forms/Controls.TextArea.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);
 	}

diff --git a/tests/Forms/Controls.TextInput.render.phpt b/tests/Forms/Controls.TextInput.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);
 	}

diff --git a/tests/Forms/Controls.UploadControl.render.phpt b/tests/Forms/Controls.UploadControl.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);
 	}

diff --git a/tests/Forms/Controls.translate().phpt b/tests/Forms/Controls.translate().phpt
@@ -13,7 +13,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements \Nette\Localization\ITranslator
 {
-	function translate($message, $count = null)
+	public function translate($message, $count = null)
 	{
 		return is_object($message) ? get_class($message) : $message;
 	}

diff --git a/tests/Forms/Forms.renderer.1.phpt b/tests/Forms/Forms.renderer.1.phpt
@@ -13,7 +13,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $_SERVER['REQUEST_METHOD'] = 'POST';
-$_POST = ['name' => 'John Doe ','age' => '','email' => '  @ ','send' => 'on','street' => '','city' => '','country' => 'HU','password' => 'xxx','password2' => '','note' => '','submit1' => 'Send','userid' => '231'];
+$_POST = ['name' => 'John Doe ', 'age' => '', 'email' => '  @ ', 'send' => 'on', 'street' => '', 'city' => '', 'country' => 'HU', 'password' => 'xxx', 'password2' => '', 'note' => '', 'submit1' => 'Send', 'userid' => '231'];
 
 
 $countries = [

diff --git a/tests/Forms/Forms.renderer.2.phpt b/tests/Forms/Forms.renderer.2.phpt
@@ -13,7 +13,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 $_SERVER['REQUEST_METHOD'] = 'POST';
-$_POST = ['name' => 'John Doe ','age' => '9.9','email' => '@','street' => '','city' => 'Troubsko','country' => '0','password' => 'xx','password2' => 'xx','note' => '','submit1' => 'Send','userid' => '231'];
+$_POST = ['name' => 'John Doe ', 'age' => '9.9', 'email' => '@', 'street' => '', 'city' => 'Troubsko', 'country' => '0', 'password' => 'xx', 'password2' => 'xx', 'note' => '', 'submit1' => 'Send', 'userid' => '231'];
 
 
 $countries = [

diff --git a/tests/Forms/Forms.renderer.translate.phpt b/tests/Forms/Forms.renderer.translate.phpt
@@ -15,7 +15,7 @@ require __DIR__ . '/../bootstrap.php';
 
 class Translator implements ITranslator
 {
-	function translate($message, $count = null)
+	public function translate($message, $count = null)
 	{
 		return strtoupper($message);
 	}

diff --git a/tests/Forms/Helpers.exportRules.phpt b/tests/Forms/Helpers.exportRules.phpt
@@ -31,7 +31,7 @@ test(function () {
 	$input = $form->addText('text');
 	$input->addRule(Form::EMAIL);
 	Assert::same([
-		['op' => ':email', 'msg' => 'Please enter a valid email address.']
+		['op' => ':email', 'msg' => 'Please enter a valid email address.'],
 	], Helpers::exportRules($input->getRules()));
 });
 

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -17,7 +17,7 @@ function before(\Closure $function = null)
 {
 	static $val;
 	if (!func_num_args()) {
-		return ($val ? $val() : null);
+		return $val ? $val() : null;
 	}
 	$val = $function;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     	 *      \---
     	 *    \---
     	 *  \--
-    	 *
     	 * @var array of HTML tags */
     	public $wrappers = [
     		'form' => [
@@ Expand Down @@