Skip to content

Commit 759b16a

Browse files
dgdg
committed
improved coding style
1 parent 35987bc commit 759b16a

12 files changed

+74
-69
lines changed

‎src/PhpGenerator/ClassType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
namespace Nette\PhpGenerator;
99

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

1313

1414
/**

‎src/PhpGenerator/Helpers.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ private static function _dump(& $var, $level = 0)
111111
}
112112
foreach ($arr as $k => & $v) {
113113
if (!isset($props) || isset($props[$k])) {
114-
$out .= "$space\t" . self::_dump($k, $level + 1) . " => " . self::_dump($v, $level + 1) . ",\n";
114+
$out .= "$space\t" . self::_dump($k, $level + 1) . ' => ' . self::_dump($v, $level + 1) . ",\n";
115115
}
116116
}
117117
array_pop($list);
@@ -179,7 +179,7 @@ public static function formatMember($name)
179179
{
180180
return $name instanceof PhpLiteral || !self::isIdentifier($name)
181181
? '{' . self::_dump($name) . '}'
182-
: $name ;
182+
: $name;
183183
}
184184

185185

‎src/PhpGenerator/Parameter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public static function from(\ReflectionParameter $from)
6363
$param->defaultValue = (PHP_VERSION_ID === 50316 ? $from->isOptional() : $from->isDefaultValueAvailable()) ? $from->getDefaultValue() : NULL;
6464

6565
$namespace = $from->getDeclaringClass()->getNamespaceName();
66-
$namespace = $namespace ? "\\$namespace\\" : "\\";
66+
$namespace = $namespace ? "\\$namespace\\" : '\\';
6767
if (Nette\Utils\Strings::startsWith($param->typeHint, $namespace)) {
6868
$param->typeHint = substr($param->typeHint, strlen($namespace));
6969
}

‎tests/PhpGenerator/ClassType.from.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
namespace Abc;
88

9-
use Nette\PhpGenerator\ClassType,
10-
ReflectionClass,
11-
Tester\Assert;
9+
use Nette\PhpGenerator\ClassType;
10+
use ReflectionClass;
11+
use Tester\Assert;
1212

1313

1414
require __DIR__ . '/../bootstrap.php';

‎tests/PhpGenerator/ClassType.from.trait.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* @phpversion 5.4
66
*/
77

8-
use Nette\PhpGenerator\ClassType,
9-
Tester\Assert;
8+
use Nette\PhpGenerator\ClassType;
9+
use Tester\Assert;
1010

1111

1212
require __DIR__ . '/../bootstrap.php';

‎tests/PhpGenerator/ClassType.inheritance.phpt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
use Nette\PhpGenerator\ClassType,
4-
ReflectionClass,
5-
Tester\Assert;
3+
use Nette\PhpGenerator\ClassType;
4+
use ReflectionClass;
5+
use Tester\Assert;
66

77

88
require __DIR__ . '/../bootstrap.php';
@@ -14,7 +14,9 @@ class A
1414
protected $b;
1515
private $c;
1616

17-
function foo() {}
17+
function foo()
18+
{
19+
}
1820
}
1921

2022

@@ -24,7 +26,10 @@ class B extends A
2426
protected $e;
2527
private $f;
2628

27-
function bar() { return 3; }
29+
function bar()
30+
{
31+
return 3;
32+
}
2833
}
2934

3035

‎tests/PhpGenerator/ClassType.interface.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
* Test: Nette\PhpGenerator for interfaces.
55
*/
66

7-
use Nette\PhpGenerator\ClassType,
8-
Tester\Assert;
7+
use Nette\PhpGenerator\ClassType;
8+
use Tester\Assert;
99

1010

1111
require __DIR__ . '/../bootstrap.php';

‎tests/PhpGenerator/ClassType.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* Test: Nette\PhpGenerator for classes.
55
*/
66

7-
use Nette\PhpGenerator\ClassType,
8-
Nette\PhpGenerator\PhpLiteral,
9-
Tester\Assert;
7+
use Nette\PhpGenerator\ClassType;
8+
use Nette\PhpGenerator\PhpLiteral;
9+
use Tester\Assert;
1010

1111

1212
require __DIR__ . '/../bootstrap.php';

‎tests/PhpGenerator/Helpers.dump().phpt

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
* Test: Nette\PhpGenerator\Helpers::dump()
55
*/
66

7-
use Nette\PhpGenerator\Helpers,
8-
Nette\PhpGenerator\PhpLiteral,
9-
Tester\Assert;
7+
use Nette\PhpGenerator\Helpers;
8+
use Nette\PhpGenerator\PhpLiteral;
9+
use Tester\Assert;
1010

1111

1212
require __DIR__ . '/../bootstrap.php';
1313

1414

15-
Assert::same( '1', Helpers::dump(1) );
16-
Assert::same( '1.0', Helpers::dump(1.0) );
17-
Assert::same( 'NULL', Helpers::dump(NULL) );
18-
Assert::same( 'TRUE', Helpers::dump(TRUE) );
19-
Assert::same( 'FALSE', Helpers::dump(FALSE) );
15+
Assert::same('1', Helpers::dump(1));
16+
Assert::same('1.0', Helpers::dump(1.0));
17+
Assert::same('NULL', Helpers::dump(NULL));
18+
Assert::same('TRUE', Helpers::dump(TRUE));
19+
Assert::same('FALSE', Helpers::dump(FALSE));
2020

21-
Assert::same( "''", Helpers::dump('') );
22-
Assert::same( "'Hello'", Helpers::dump('Hello') );
23-
Assert::same( "'I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n'", Helpers::dump("I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n") ); // Iñtërnâtiônàlizætiøn
24-
Assert::same( '"\rHello \$"', Helpers::dump("\rHello $") );
25-
Assert::same( 'array()', Helpers::dump(array()) );
21+
Assert::same("''", Helpers::dump(''));
22+
Assert::same("'Hello'", Helpers::dump('Hello'));
23+
Assert::same("'I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n'", Helpers::dump("I\xc3\xb1t\xc3\xabrn\xc3\xa2ti\xc3\xb4n\xc3\xa0liz\xc3\xa6ti\xc3\xb8n")); // Iñtërnâtiônàlizætiøn
24+
Assert::same('"\rHello \$"', Helpers::dump("\rHello $"));
25+
Assert::same('array()', Helpers::dump(array()));
2626

27-
Assert::same( "array(\$s)", Helpers::dump(array(new PhpLiteral('$s'))) );
27+
Assert::same("array(\$s)", Helpers::dump(array(new PhpLiteral('$s'))));
2828

29-
Assert::same( "array(1, 2, 3)", Helpers::dump(array(1,2,3)) );
30-
Assert::same( "array('a', 7 => 'b', 'c', '9a' => 'd', 'e')", Helpers::dump(array('a', 7 => 'b', 'c', '9a' => 'd', 9 => 'e')) );
31-
Assert::same( "array(\n\tarray(\n\t\t'a',\n\t\t'loooooooooooooooooooooooooooooooooong',\n\t),\n)", Helpers::dump(array(array('a', 'loooooooooooooooooooooooooooooooooong'))) );
32-
Assert::same( "array('a' => 1, array(\"\\r\" => \"\\r\", 2), 3)", Helpers::dump(array('a' => 1, array("\r" => "\r", 2), 3)) );
29+
Assert::same('array(1, 2, 3)', Helpers::dump(array(1, 2, 3)));
30+
Assert::same("array('a', 7 => 'b', 'c', '9a' => 'd', 'e')", Helpers::dump(array('a', 7 => 'b', 'c', '9a' => 'd', 9 => 'e')));
31+
Assert::same("array(\n\tarray(\n\t\t'a',\n\t\t'loooooooooooooooooooooooooooooooooong',\n\t),\n)", Helpers::dump(array(array('a', 'loooooooooooooooooooooooooooooooooong'))));
32+
Assert::same("array('a' => 1, array(\"\\r\" => \"\\r\", 2), 3)", Helpers::dump(array('a' => 1, array("\r" => "\r", 2), 3)));
3333

34-
Assert::same( "(object) array(\n\t'a' => 1,\n\t'b' => 2,\n)", Helpers::dump((object) array('a' => 1, 'b' => 2)) );
35-
Assert::same( "(object) array(\n\t'a' => (object) array(\n\t\t'b' => 2,\n\t),\n)" , Helpers::dump((object) array('a' => (object) array('b' => 2))) );
34+
Assert::same("(object) array(\n\t'a' => 1,\n\t'b' => 2,\n)", Helpers::dump((object) array('a' => 1, 'b' => 2)));
35+
Assert::same("(object) array(\n\t'a' => (object) array(\n\t\t'b' => 2,\n\t),\n)" , Helpers::dump((object) array('a' => (object) array('b' => 2))));
3636

3737

3838
class Test
@@ -42,8 +42,8 @@ class Test
4242
private $c = 3;
4343
}
4444

45-
Assert::same( "Nette\\PhpGenerator\\Helpers::createObject('Test', array(\n\t'a' => 1,\n\t\"\\x00*\\x00b\" => 2,\n\t\"\\x00Test\\x00c\" => 3,\n))", Helpers::dump(new Test) );
46-
Assert::equal( new Test, eval('return ' . Helpers::dump(new Test) . ';') );
45+
Assert::same("Nette\\PhpGenerator\\Helpers::createObject('Test', array(\n\t'a' => 1,\n\t\"\\x00*\\x00b\" => 2,\n\t\"\\x00Test\\x00c\" => 3,\n))", Helpers::dump(new Test));
46+
Assert::equal(new Test, eval('return ' . Helpers::dump(new Test) . ';'));
4747

4848

4949
class Test2 extends Test
@@ -61,8 +61,8 @@ class Test2 extends Test
6161
}
6262
}
6363

64-
Assert::same( "Nette\\PhpGenerator\\Helpers::createObject('Test2', array(\n\t\"\\x00Test2\\x00c\" => 4,\n\t'a' => 1,\n\t\"\\x00*\\x00b\" => 2,\n))", Helpers::dump(new Test2) );
65-
Assert::equal( new Test2, eval('return ' . Helpers::dump(new Test2) . ';') );
64+
Assert::same("Nette\\PhpGenerator\\Helpers::createObject('Test2', array(\n\t\"\\x00Test2\\x00c\" => 4,\n\t'a' => 1,\n\t\"\\x00*\\x00b\" => 2,\n))", Helpers::dump(new Test2));
65+
Assert::equal(new Test2, eval('return ' . Helpers::dump(new Test2) . ';'));
6666

6767

6868
class Test3 implements Serializable
@@ -79,5 +79,5 @@ class Test3 implements Serializable
7979
}
8080
}
8181

82-
Assert::same( 'unserialize(\'C:5:"Test3":0:{}\')', Helpers::dump(new Test3) );
83-
Assert::equal( new Test3, eval('return ' . Helpers::dump(new Test3) . ';') );
82+
Assert::same('unserialize(\'C:5:"Test3":0:{}\')', Helpers::dump(new Test3));
83+
Assert::equal(new Test3, eval('return ' . Helpers::dump(new Test3) . ';'));

‎tests/PhpGenerator/Helpers.format.phpt

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,36 @@
44
* Test: Nette\PhpGenerator\Helpers::format() & formatArgs()
55
*/
66

7-
use Nette\PhpGenerator\Helpers,
8-
Tester\Assert;
7+
use Nette\PhpGenerator\Helpers;
8+
use Tester\Assert;
99

1010

1111
require __DIR__ . '/../bootstrap.php';
1212

1313

14-
Assert::same( 'func', Helpers::format('func') );
15-
Assert::same( 'func(1)', Helpers::format('func(?)', 1, 2) );
14+
Assert::same('func', Helpers::format('func'));
15+
Assert::same('func(1)', Helpers::format('func(?)', 1, 2));
1616

17-
Assert::same( 'func', Helpers::formatArgs('func', array(1, 2)) );
18-
Assert::same( 'func(1)', Helpers::formatArgs('func(?)', array(1, 2)) );
19-
Assert::same( "func(array(1, 2))", Helpers::formatArgs('func(?)', array(array(1, 2))) );
20-
Assert::same( 'func(1, 2)', Helpers::formatArgs('func(?*)', array(array(1, 2))) );
17+
Assert::same('func', Helpers::formatArgs('func', array(1, 2)));
18+
Assert::same('func(1)', Helpers::formatArgs('func(?)', array(1, 2)));
19+
Assert::same('func(array(1, 2))', Helpers::formatArgs('func(?)', array(array(1, 2))));
20+
Assert::same('func(1, 2)', Helpers::formatArgs('func(?*)', array(array(1, 2))));
2121

22-
Assert::exception(function() {
22+
Assert::exception(function () {
2323
Helpers::formatArgs('func(?*)', array(1, 2));
2424
}, 'Nette\InvalidArgumentException', 'Argument must be an array.');
2525

26-
Assert::exception(function() {
26+
Assert::exception(function () {
2727
Helpers::formatArgs('func(?, ?, ?)', array(1, 2));
2828
}, 'Nette\InvalidArgumentException', 'Insufficient number of arguments.');
2929

30-
Assert::same( '$a = 2', Helpers::formatArgs('$? = ?', array('a', 2)) );
31-
Assert::same( '$obj->a = 2', Helpers::formatArgs('$obj->? = ?', array('a', 2)) );
32-
Assert::same( '$obj->{1} = 2', Helpers::formatArgs('$obj->? = ?', array(1, 2)) );
33-
Assert::same( '$obj->{\' \'} = 2', Helpers::formatArgs('$obj->? = ?', array(' ', 2)) );
30+
Assert::same('$a = 2', Helpers::formatArgs('$? = ?', array('a', 2)));
31+
Assert::same('$obj->a = 2', Helpers::formatArgs('$obj->? = ?', array('a', 2)));
32+
Assert::same('$obj->{1} = 2', Helpers::formatArgs('$obj->? = ?', array(1, 2)));
33+
Assert::same('$obj->{\' \'} = 2', Helpers::formatArgs('$obj->? = ?', array(' ', 2)));
3434

35-
Assert::same( "Item", Helpers::formatMember('Item') );
36-
Assert::same( "{'0Item'}", Helpers::formatMember('0Item') );
35+
Assert::same('Item', Helpers::formatMember('Item'));
36+
Assert::same("{'0Item'}", Helpers::formatMember('0Item'));
3737

38-
Assert::true( Helpers::isIdentifier('Item') );
39-
Assert::false( Helpers::isIdentifier('0Item') );
38+
Assert::true(Helpers::isIdentifier('Item'));
39+
Assert::false(Helpers::isIdentifier('0Item'));

0 commit comments

Comments
 (0)