Skip to content

Commit 55d0eb8

Browse files
dgdg
committed
improved coding style
1 parent 48aa5d2 commit 55d0eb8

File tree

87 files changed

+1226
-1226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+1226
-1226
lines changed

‎examples/basic-example.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
die('Install packages using `composer install`');
1010
}
1111

12-
use Nette\Forms\Form,
13-
Tracy\Debugger,
14-
Tracy\Dumper,
15-
Nette\Utils\Html;
12+
use Nette\Forms\Form;
13+
use Tracy\Debugger;
14+
use Tracy\Dumper;
15+
use Nette\Utils\Html;
1616

1717
Debugger::enable();
1818

@@ -73,7 +73,7 @@
7373
'qu' => 'Qumran',
7474
'st' => 'Saint Georges Island',
7575
],
76-
'?' => 'other',
76+
'?' => 'other',
7777
];
7878
$form->addSelect('country', 'Country:', $countries)
7979
->setPrompt('Select your country')
@@ -107,8 +107,8 @@
107107

108108

109109
$form->setDefaults([
110-
'name' => 'John Doe',
111-
'userid' => 231,
110+
'name' => 'John Doe',
111+
'userid' => 231,
112112
]);
113113

114114

‎examples/bootstrap2-rendering.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
die('Install packages using `composer install`');
1010
}
1111

12-
use Nette\Forms\Form,
13-
Nette\Forms\Controls,
14-
Tracy\Debugger,
15-
Tracy\Dumper;
12+
use Nette\Forms\Form;
13+
use Nette\Forms\Controls;
14+
use Tracy\Debugger;
15+
use Tracy\Dumper;
1616

1717
Debugger::enable();
1818

‎examples/bootstrap3-rendering.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
die('Install packages using `composer install`');
1010
}
1111

12-
use Nette\Forms\Form,
13-
Nette\Forms\Controls,
14-
Tracy\Debugger,
15-
Tracy\Dumper;
12+
use Nette\Forms\Form;
13+
use Nette\Forms\Controls;
14+
use Tracy\Debugger;
15+
use Tracy\Dumper;
1616

1717
Debugger::enable();
1818

‎examples/containers.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
die('Install packages using `composer install`');
1010
}
1111

12-
use Nette\Forms\Form,
13-
Tracy\Debugger,
14-
Tracy\Dumper;
12+
use Nette\Forms\Form;
13+
use Tracy\Debugger;
14+
use Tracy\Dumper;
1515

1616
Debugger::enable();
1717

‎examples/custom-control.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
die('Install packages using `composer install`');
1010
}
1111

12-
use Nette\Forms\Form,
13-
Nette\Utils\Html;
12+
use Nette\Forms\Form;
13+
use Nette\Utils\Html;
1414

1515

1616
class DateInput extends Nette\Forms\Controls\BaseControl

‎examples/custom-rendering.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
die('Install packages using `composer install`');
1010
}
1111

12-
use Nette\Forms\Form,
13-
Tracy\Debugger,
14-
Tracy\Dumper,
15-
Nette\Utils\Html;
12+
use Nette\Forms\Form;
13+
use Tracy\Debugger;
14+
use Tracy\Dumper;
15+
use Nette\Utils\Html;
1616

1717
Debugger::enable();
1818

‎examples/custom-validator.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
die('Install packages using `composer install`');
1010
}
1111

12-
use Nette\Forms\Form,
13-
Tracy\Debugger,
14-
Tracy\Dumper;
12+
use Nette\Forms\Form;
13+
use Tracy\Debugger;
14+
use Tracy\Dumper;
1515

1616
Debugger::enable();
1717

‎examples/html5.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
die('Install packages using `composer install`');
1010
}
1111

12-
use Nette\Forms\Form,
13-
Tracy\Debugger,
14-
Tracy\Dumper;
12+
use Nette\Forms\Form;
13+
use Tracy\Debugger;
14+
use Tracy\Dumper;
1515

1616
Debugger::enable();
1717

‎examples/localization.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
}
1111

1212

13-
use Nette\Forms\Form,
14-
Tracy\Debugger,
15-
Tracy\Dumper,
16-
Nette\Utils\Html;
13+
use Nette\Forms\Form;
14+
use Tracy\Debugger;
15+
use Tracy\Dumper;
16+
use Nette\Utils\Html;
1717

1818
Debugger::enable();
1919

@@ -57,7 +57,7 @@ public function translate($message, $count = NULL)
5757
'qu' => 'Qumran',
5858
'st' => 'Saint Georges Island',
5959
],
60-
'?' => 'other',
60+
'?' => 'other',
6161
];
6262
$form->addSelect('country', 'Country:', $countries)
6363
->setPrompt('Select your country');

‎examples/manual-rendering.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
die('Install packages using `composer install`');
1010
}
1111

12-
use Nette\Forms\Form,
13-
Tracy\Debugger,
14-
Tracy\Dumper;
12+
use Nette\Forms\Form;
13+
use Tracy\Debugger;
14+
use Tracy\Dumper;
1515

1616
Debugger::enable();
1717

‎src/Bridges/FormsDI/FormsExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class FormsExtension extends Nette\DI\CompilerExtension
2020
{
2121
public $defaults = [
22-
'messages' => []
22+
'messages' => [],
2323
];
2424

2525

‎src/Bridges/FormsLatte/FormMacros.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
namespace Nette\Bridges\FormsLatte;
99

10-
use Nette,
11-
Latte,
12-
Latte\MacroNode,
13-
Latte\PhpWriter,
14-
Latte\CompileException,
15-
Latte\Macros\MacroSet,
16-
Nette\Forms\Form;
10+
use Nette;
11+
use Latte;
12+
use Latte\MacroNode;
13+
use Latte\PhpWriter;
14+
use Latte\CompileException;
15+
use Latte\Macros\MacroSet;
16+
use Nette\Forms\Form;
1717

1818

1919
/**

‎src/Bridges/FormsLatte/Runtime.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
namespace Nette\Bridges\FormsLatte;
99

10-
use Nette,
11-
Nette\Utils\Html,
12-
Nette\Forms\Form;
10+
use Nette;
11+
use Nette\Utils\Html;
12+
use Nette\Forms\Form;
1313

1414

1515
/**

‎src/Forms/Container.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
class Container extends Nette\ComponentModel\Container implements \ArrayAccess
2626
{
27-
/** @var callable[] function(Container $sender); Occurs when the form is validated */
27+
/** @var callable[] function (Container $sender); Occurs when the form is validated */
2828
public $onValidate;
2929

3030
/** @var ControlGroup */
@@ -77,7 +77,7 @@ public function setValues($values, $erase = FALSE)
7777
$control->setValue(NULL);
7878
}
7979

80-
} elseif ($control instanceof Container) {
80+
} elseif ($control instanceof self) {
8181
if (array_key_exists($name, $values)) {
8282
$control->setValues($values[$name], $erase);
8383

@@ -102,7 +102,7 @@ public function getValues($asArray = FALSE)
102102
if ($control instanceof IControl && !$control->isOmitted()) {
103103
$values[$name] = $control->getValue();
104104

105-
} elseif ($control instanceof Container) {
105+
} elseif ($control instanceof self) {
106106
$values[$name] = $control->getValues($asArray);
107107
}
108108
}
@@ -429,7 +429,7 @@ public function addImage($name, $src = NULL, $alt = NULL)
429429
*/
430430
public function addContainer($name)
431431
{
432-
$control = new Container;
432+
$control = new self;
433433
$control->currentGroup = $this->currentGroup;
434434
return $this[$name] = $control;
435435
}

‎src/Forms/Controls/BaseControl.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77

88
namespace Nette\Forms\Controls;
99

10-
use Nette,
11-
Nette\Forms\IControl,
12-
Nette\Utils\Html,
13-
Nette\Forms\Form;
10+
use Nette;
11+
use Nette\Forms\IControl;
12+
use Nette\Utils\Html;
13+
use Nette\Forms\Form;
1414

1515

1616
/**

‎src/Forms/Controls/CheckboxList.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
namespace Nette\Forms\Controls;
99

10-
use Nette,
11-
Nette\Utils\Html;
10+
use Nette;
11+
use Nette\Utils\Html;
1212

1313

1414
/**

‎src/Forms/Controls/ChoiceControl.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public function loadHttpData()
5959
public function setValue($value)
6060
{
6161
if ($value !== NULL && !array_key_exists((string) $value, $this->items)) {
62-
$range = Nette\Utils\Strings::truncate(implode(', ', array_map(function($s) { return var_export($s, TRUE); }, array_keys($this->items))), 70, '...');
62+
$range = Nette\Utils\Strings::truncate(implode(', ', array_map(function ($s) { return var_export($s, TRUE); }, array_keys($this->items))), 70, '...');
6363
throw new Nette\InvalidArgumentException("Value '$value' is out of allowed range [$range] in field '{$this->name}'.");
6464
}
6565
$this->value = $value === NULL ? NULL : key([(string) $value => NULL]);

‎src/Forms/Controls/MultiChoiceControl.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function setValue($values)
6868
}
6969
$values = array_keys($flip);
7070
if ($diff = array_diff($values, array_keys($this->items))) {
71-
$range = Nette\Utils\Strings::truncate(implode(', ', array_map(function($s) { return var_export($s, TRUE); }, array_keys($this->items))), 70, '...');
71+
$range = Nette\Utils\Strings::truncate(implode(', ', array_map(function ($s) { return var_export($s, TRUE); }, array_keys($this->items))), 70, '...');
7272
$vals = (count($diff) > 1 ? 's' : '') . " '" . implode("', '", $diff) . "'";
7373
throw new Nette\InvalidArgumentException("Value$vals are out of allowed range [$range] in field '{$this->name}'.");
7474
}

‎src/Forms/Controls/MultiSelectBox.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function getControl()
6161
$items,
6262
[
6363
'selected?' => $this->value,
64-
'disabled:' => is_array($this->disabled) ? $this->disabled : NULL
64+
'disabled:' => is_array($this->disabled) ? $this->disabled : NULL,
6565
]
6666
)->addAttributes(parent::getControl()->attrs)->multiple(TRUE);
6767
}

‎src/Forms/Controls/RadioList.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
namespace Nette\Forms\Controls;
99

10-
use Nette,
11-
Nette\Utils\Html;
10+
use Nette;
11+
use Nette\Utils\Html;
1212

1313

1414
/**

‎src/Forms/Controls/SelectBox.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public function getControl()
9191
$items,
9292
[
9393
'selected?' => $this->value,
94-
'disabled:' => is_array($this->disabled) ? $this->disabled : NULL
94+
'disabled:' => is_array($this->disabled) ? $this->disabled : NULL,
9595
]
9696
)->addAttributes(parent::getControl()->attrs);
9797
}

‎src/Forms/Controls/SubmitButton.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
*/
2121
class SubmitButton extends Button implements Nette\Forms\ISubmitterControl
2222
{
23-
/** @var callable[] function(SubmitButton $sender); Occurs when the button is clicked and form is successfully validated */
23+
/** @var callable[] function (SubmitButton $sender); Occurs when the button is clicked and form is successfully validated */
2424
public $onClick;
2525

26-
/** @var callable[] function(SubmitButton $sender); Occurs when the button is clicked and form is not validated */
26+
/** @var callable[] function (SubmitButton $sender); Occurs when the button is clicked and form is not validated */
2727
public $onInvalidClick;
2828

2929
/** @var array */

‎src/Forms/Controls/TextBase.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
namespace Nette\Forms\Controls;
99

10-
use Nette,
11-
Nette\Forms\Form,
12-
Nette\Utils\Strings;
10+
use Nette;
11+
use Nette\Forms\Form;
12+
use Nette\Utils\Strings;
1313

1414

1515
/**

‎src/Forms/Controls/UploadControl.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
namespace Nette\Forms\Controls;
99

10-
use Nette,
11-
Nette\Http\FileUpload;
10+
use Nette;
11+
use Nette\Http\FileUpload;
1212

1313

1414
/**

‎src/Forms/Form.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ class Form extends Container implements Nette\Utils\IHtmlString
8383
/** @internal protection token ID */
8484
const PROTECTOR_ID = '_token_';
8585

86-
/** @var callable[] function(Form $sender); Occurs when the form is submitted and successfully validated */
86+
/** @var callable[] function (Form $sender); Occurs when the form is submitted and successfully validated */
8787
public $onSuccess;
8888

89-
/** @var callable[] function(Form $sender); Occurs when the form is submitted and is not valid */
89+
/** @var callable[] function (Form $sender); Occurs when the form is submitted and is not valid */
9090
public $onError;
9191

92-
/** @var callable[] function(Form $sender); Occurs when the form is submitted */
92+
/** @var callable[] function (Form $sender); Occurs when the form is submitted */
9393
public $onSubmit;
9494

9595
/** @var mixed or NULL meaning: not detected yet */

‎src/Forms/Helpers.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
namespace Nette\Forms;
99

10-
use Nette,
11-
Nette\Utils\Strings,
12-
Nette\Utils\Html;
10+
use Nette;
11+
use Nette\Utils\Strings;
12+
use Nette\Utils\Html;
1313

1414

1515
/**
@@ -110,7 +110,7 @@ public static function exportRules(Rules $rules)
110110
$item = [
111111
'op' => ($rule->isNegative ? '~' : '') . $op,
112112
'rules' => static::exportRules($rule->branch),
113-
'control' => $rule->control->getHtmlName()
113+
'control' => $rule->control->getHtmlName(),
114114
];
115115
if ($rule->branch->getToggles()) {
116116
$item['toggle'] = $rule->branch->getToggles();

0 commit comments

Comments
 (0)