improved coding style

nette · Jun 19, 2015 · 55d0eb8 · 55d0eb8
1 parent 48aa5d2
commit 55d0eb8
Show file tree

Hide file tree

Showing 87 changed files with 1,226 additions and 1,226 deletions.
diff --git a/examples/basic-example.php b/examples/basic-example.php
@@ -9,10 +9,10 @@
  die('Install packages using `composer install`');
 }
 
-use Nette\Forms\Form,
- Tracy\Debugger,
- Tracy\Dumper,
- Nette\Utils\Html;
+use Nette\Forms\Form;
+use Tracy\Debugger;
+use Tracy\Dumper;
+use Nette\Utils\Html;
 
 Debugger::enable();
 
@@ -73,7 +73,7 @@
  'qu' => 'Qumran',
  'st' => 'Saint Georges Island',
  ],
- '?'  => 'other',
+ '?' => 'other',
 ];
 $form->addSelect('country', 'Country:', $countries)
  ->setPrompt('Select your country')
@@ -107,8 +107,8 @@
 
 
 $form->setDefaults([
- 'name'  => 'John Doe',
- 'userid'  => 231,
+ 'name' => 'John Doe',
+ 'userid' => 231,
 ]);
 
 

diff --git a/examples/bootstrap2-rendering.php b/examples/bootstrap2-rendering.php
@@ -9,10 +9,10 @@
  die('Install packages using `composer install`');
 }
 
-use Nette\Forms\Form,
- Nette\Forms\Controls,
- Tracy\Debugger,
- Tracy\Dumper;
+use Nette\Forms\Form;
+use Nette\Forms\Controls;
+use Tracy\Debugger;
+use Tracy\Dumper;
 
 Debugger::enable();
 

diff --git a/examples/bootstrap3-rendering.php b/examples/bootstrap3-rendering.php
@@ -9,10 +9,10 @@
  die('Install packages using `composer install`');
 }
 
-use Nette\Forms\Form,
- Nette\Forms\Controls,
- Tracy\Debugger,
- Tracy\Dumper;
+use Nette\Forms\Form;
+use Nette\Forms\Controls;
+use Tracy\Debugger;
+use Tracy\Dumper;
 
 Debugger::enable();
 

diff --git a/examples/containers.php b/examples/containers.php
@@ -9,9 +9,9 @@
  die('Install packages using `composer install`');
 }
 
-use Nette\Forms\Form,
- Tracy\Debugger,
- Tracy\Dumper;
+use Nette\Forms\Form;
+use Tracy\Debugger;
+use Tracy\Dumper;
 
 Debugger::enable();
 

diff --git a/examples/custom-control.php b/examples/custom-control.php
@@ -9,8 +9,8 @@
  die('Install packages using `composer install`');
 }
 
-use Nette\Forms\Form,
- Nette\Utils\Html;
+use Nette\Forms\Form;
+use Nette\Utils\Html;
 
 
 class DateInput extends Nette\Forms\Controls\BaseControl

diff --git a/examples/custom-rendering.php b/examples/custom-rendering.php
@@ -9,10 +9,10 @@
  die('Install packages using `composer install`');
 }
 
-use Nette\Forms\Form,
- Tracy\Debugger,
- Tracy\Dumper,
- Nette\Utils\Html;
+use Nette\Forms\Form;
+use Tracy\Debugger;
+use Tracy\Dumper;
+use Nette\Utils\Html;
 
 Debugger::enable();
 

diff --git a/examples/custom-validator.php b/examples/custom-validator.php
@@ -9,9 +9,9 @@
  die('Install packages using `composer install`');
 }
 
-use Nette\Forms\Form,
- Tracy\Debugger,
- Tracy\Dumper;
+use Nette\Forms\Form;
+use Tracy\Debugger;
+use Tracy\Dumper;
 
 Debugger::enable();
 

diff --git a/examples/html5.php b/examples/html5.php
@@ -9,9 +9,9 @@
  die('Install packages using `composer install`');
 }
 
-use Nette\Forms\Form,
- Tracy\Debugger,
- Tracy\Dumper;
+use Nette\Forms\Form;
+use Tracy\Debugger;
+use Tracy\Dumper;
 
 Debugger::enable();
 

diff --git a/examples/localization.php b/examples/localization.php
@@ -10,10 +10,10 @@
 }
 
 
-use Nette\Forms\Form,
- Tracy\Debugger,
- Tracy\Dumper,
- Nette\Utils\Html;
+use Nette\Forms\Form;
+use Tracy\Debugger;
+use Tracy\Dumper;
+use Nette\Utils\Html;
 
 Debugger::enable();
 
@@ -57,7 +57,7 @@ public function translate($message, $count = NULL)
  'qu' => 'Qumran',
  'st' => 'Saint Georges Island',
  ],
- '?'  => 'other',
+ '?' => 'other',
 ];
 $form->addSelect('country', 'Country:', $countries)
  ->setPrompt('Select your country');

diff --git a/examples/manual-rendering.php b/examples/manual-rendering.php
@@ -9,9 +9,9 @@
  die('Install packages using `composer install`');
 }
 
-use Nette\Forms\Form,
- Tracy\Debugger,
- Tracy\Dumper;
+use Nette\Forms\Form;
+use Tracy\Debugger;
+use Tracy\Dumper;
 
 Debugger::enable();
 

diff --git a/src/Bridges/FormsDI/FormsExtension.php b/src/Bridges/FormsDI/FormsExtension.php
@@ -19,7 +19,7 @@
 class FormsExtension extends Nette\DI\CompilerExtension
 {
  public $defaults = [
- 'messages' => []
+ 'messages' => [],
  ];
 
 

diff --git a/src/Bridges/FormsLatte/FormMacros.php b/src/Bridges/FormsLatte/FormMacros.php
@@ -7,13 +7,13 @@
 
 namespace Nette\Bridges\FormsLatte;
 
-use Nette,
- Latte,
- Latte\MacroNode,
- Latte\PhpWriter,
- Latte\CompileException,
- Latte\Macros\MacroSet,
- Nette\Forms\Form;
+use Nette;
+use Latte;
+use Latte\MacroNode;
+use Latte\PhpWriter;
+use Latte\CompileException;
+use Latte\Macros\MacroSet;
+use Nette\Forms\Form;
 
 
 /**

diff --git a/src/Bridges/FormsLatte/Runtime.php b/src/Bridges/FormsLatte/Runtime.php
@@ -7,9 +7,9 @@
 
 namespace Nette\Bridges\FormsLatte;
 
-use Nette,
- Nette\Utils\Html,
- Nette\Forms\Form;
+use Nette;
+use Nette\Utils\Html;
+use Nette\Forms\Form;
 
 
 /**

diff --git a/src/Forms/Container.php b/src/Forms/Container.php
@@ -24,7 +24,7 @@
  */
 class Container extends Nette\ComponentModel\Container implements \ArrayAccess
 {
- /** @var callable[] function(Container $sender); Occurs when the form is validated */
+ /** @var callable[] function (Container $sender); Occurs when the form is validated */
  public $onValidate;
 
  /** @var ControlGroup */
@@ -77,7 +77,7 @@ public function setValues($values, $erase = FALSE)
  $control->setValue(NULL);
  }
 
- } elseif ($control instanceof Container) {
+ } elseif ($control instanceof self) {
  if (array_key_exists($name, $values)) {
  $control->setValues($values[$name], $erase);
 
@@ -102,7 +102,7 @@ public function getValues($asArray = FALSE)
  if ($control instanceof IControl && !$control->isOmitted()) {
  $values[$name] = $control->getValue();
 
- } elseif ($control instanceof Container) {
+ } elseif ($control instanceof self) {
  $values[$name] = $control->getValues($asArray);
  }
  }
@@ -429,7 +429,7 @@ public function addImage($name, $src = NULL, $alt = NULL)
  */
  public function addContainer($name)
  {
- $control = new Container;
+ $control = new self;
  $control->currentGroup = $this->currentGroup;
  return $this[$name] = $control;
  }

diff --git a/src/Forms/Controls/BaseControl.php b/src/Forms/Controls/BaseControl.php
@@ -7,10 +7,10 @@
 
 namespace Nette\Forms\Controls;
 
-use Nette,
- Nette\Forms\IControl,
- Nette\Utils\Html,
- Nette\Forms\Form;
+use Nette;
+use Nette\Forms\IControl;
+use Nette\Utils\Html;
+use Nette\Forms\Form;
 
 
 /**

diff --git a/src/Forms/Controls/CheckboxList.php b/src/Forms/Controls/CheckboxList.php
@@ -7,8 +7,8 @@
 
 namespace Nette\Forms\Controls;
 
-use Nette,
- Nette\Utils\Html;
+use Nette;
+use Nette\Utils\Html;
 
 
 /**

diff --git a/src/Forms/Controls/ChoiceControl.php b/src/Forms/Controls/ChoiceControl.php
@@ -59,7 +59,7 @@ public function loadHttpData()
  public function setValue($value)
  {
  if ($value !== NULL && !array_key_exists((string) $value, $this->items)) {
- $range = Nette\Utils\Strings::truncate(implode(', ', array_map(function($s) { return var_export($s, TRUE); }, array_keys($this->items))), 70, '...');
+ $range = Nette\Utils\Strings::truncate(implode(', ', array_map(function ($s) { return var_export($s, TRUE); }, array_keys($this->items))), 70, '...');
  throw new Nette\InvalidArgumentException("Value '$value' is out of allowed range [$range] in field '{$this->name}'.");
  }
  $this->value = $value === NULL ? NULL : key([(string) $value => NULL]);

diff --git a/src/Forms/Controls/MultiChoiceControl.php b/src/Forms/Controls/MultiChoiceControl.php
@@ -68,7 +68,7 @@ public function setValue($values)
  }
  $values = array_keys($flip);
  if ($diff = array_diff($values, array_keys($this->items))) {
- $range = Nette\Utils\Strings::truncate(implode(', ', array_map(function($s) { return var_export($s, TRUE); }, array_keys($this->items))), 70, '...');
+ $range = Nette\Utils\Strings::truncate(implode(', ', array_map(function ($s) { return var_export($s, TRUE); }, array_keys($this->items))), 70, '...');
  $vals = (count($diff) > 1 ? 's' : '') . " '" . implode("', '", $diff) . "'";
  throw new Nette\InvalidArgumentException("Value$vals are out of allowed range [$range] in field '{$this->name}'.");
  }

diff --git a/src/Forms/Controls/MultiSelectBox.php b/src/Forms/Controls/MultiSelectBox.php
@@ -61,7 +61,7 @@ public function getControl()
  $items,
  [
  'selected?' => $this->value,
- 'disabled:' => is_array($this->disabled) ? $this->disabled : NULL
+ 'disabled:' => is_array($this->disabled) ? $this->disabled : NULL,
  ]
  )->addAttributes(parent::getControl()->attrs)->multiple(TRUE);
  }

diff --git a/src/Forms/Controls/RadioList.php b/src/Forms/Controls/RadioList.php
@@ -7,8 +7,8 @@
 
 namespace Nette\Forms\Controls;
 
-use Nette,
- Nette\Utils\Html;
+use Nette;
+use Nette\Utils\Html;
 
 
 /**

diff --git a/src/Forms/Controls/SelectBox.php b/src/Forms/Controls/SelectBox.php
@@ -91,7 +91,7 @@ public function getControl()
  $items,
  [
  'selected?' => $this->value,
- 'disabled:' => is_array($this->disabled) ? $this->disabled : NULL
+ 'disabled:' => is_array($this->disabled) ? $this->disabled : NULL,
  ]
  )->addAttributes(parent::getControl()->attrs);
  }

diff --git a/src/Forms/Controls/SubmitButton.php b/src/Forms/Controls/SubmitButton.php
@@ -20,10 +20,10 @@
  */
 class SubmitButton extends Button implements Nette\Forms\ISubmitterControl
 {
- /** @var callable[] function(SubmitButton $sender); Occurs when the button is clicked and form is successfully validated */
+ /** @var callable[] function (SubmitButton $sender); Occurs when the button is clicked and form is successfully validated */
  public $onClick;
 
- /** @var callable[] function(SubmitButton $sender); Occurs when the button is clicked and form is not validated */
+ /** @var callable[] function (SubmitButton $sender); Occurs when the button is clicked and form is not validated */
  public $onInvalidClick;
 
  /** @var array */

diff --git a/src/Forms/Controls/TextBase.php b/src/Forms/Controls/TextBase.php
@@ -7,9 +7,9 @@
 
 namespace Nette\Forms\Controls;
 
-use Nette,
- Nette\Forms\Form,
- Nette\Utils\Strings;
+use Nette;
+use Nette\Forms\Form;
+use Nette\Utils\Strings;
 
 
 /**

diff --git a/src/Forms/Controls/UploadControl.php b/src/Forms/Controls/UploadControl.php
@@ -7,8 +7,8 @@
 
 namespace Nette\Forms\Controls;
 
-use Nette,
- Nette\Http\FileUpload;
+use Nette;
+use Nette\Http\FileUpload;
 
 
 /**

diff --git a/src/Forms/Form.php b/src/Forms/Form.php
@@ -83,13 +83,13 @@ class Form extends Container implements Nette\Utils\IHtmlString
  /** @internal protection token ID */
  const PROTECTOR_ID = '_token_';
 
- /** @var callable[] function(Form $sender); Occurs when the form is submitted and successfully validated */
+ /** @var callable[] function (Form $sender); Occurs when the form is submitted and successfully validated */
  public $onSuccess;
 
- /** @var callable[] function(Form $sender); Occurs when the form is submitted and is not valid */
+ /** @var callable[] function (Form $sender); Occurs when the form is submitted and is not valid */
  public $onError;
 
- /** @var callable[] function(Form $sender); Occurs when the form is submitted */
+ /** @var callable[] function (Form $sender); Occurs when the form is submitted */
  public $onSubmit;
 
  /** @var mixed or NULL meaning: not detected yet */

diff --git a/src/Forms/Helpers.php b/src/Forms/Helpers.php
@@ -7,9 +7,9 @@
 
 namespace Nette\Forms;
 
-use Nette,
- Nette\Utils\Strings,
- Nette\Utils\Html;
+use Nette;
+use Nette\Utils\Strings;
+use Nette\Utils\Html;
 
 
 /**
@@ -110,7 +110,7 @@ public static function exportRules(Rules $rules)
  $item = [
  'op' => ($rule->isNegative ? '~' : '') . $op,
  'rules' => static::exportRules($rule->branch),
- 'control' => $rule->control->getHtmlName()
+ 'control' => $rule->control->getHtmlName(),
  ];
  if ($rule->branch->getToggles()) {
  $item['toggle'] = $rule->branch->getToggles();