diff --git a/.travis.yml b/.travis.yml
index d67b6911..fb7ec6d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,5 +20,11 @@ after_failure:
 
 before_script:
     # Install Nette Tester & Code Checker
-    - composer install --no-interaction --dev --prefer-source
-    - composer create-project nette/code-checker code-checker ~2.3 --no-interaction --prefer-source
+    - travis_retry composer install --no-interaction --prefer-dist
+    - travis_retry composer create-project nette/code-checker code-checker ~2.5 --no-interaction
+  
+sudo: false
+
+cache:
+    directories:
+        - $HOME/.composer/cache
diff --git a/src/PhpGenerator/ClassType.php b/src/PhpGenerator/ClassType.php
index f1a74351..183f0220 100644
--- a/src/PhpGenerator/ClassType.php
+++ b/src/PhpGenerator/ClassType.php
@@ -7,8 +7,8 @@
 
 namespace Nette\PhpGenerator;
 
-use Nette,
-	Nette\Utils\Strings;
+use Nette;
+use Nette\Utils\Strings;
 
 
 /**
diff --git a/src/PhpGenerator/Helpers.php b/src/PhpGenerator/Helpers.php
index 4f50c3dc..9ce3bc22 100644
--- a/src/PhpGenerator/Helpers.php
+++ b/src/PhpGenerator/Helpers.php
@@ -111,7 +111,7 @@ private static function _dump(& $var, $level = 0)
 				}
 				foreach ($arr as $k => & $v) {
 					if (!isset($props) || isset($props[$k])) {
-						$out .= "$space\t" . self::_dump($k, $level + 1) . " => " . self::_dump($v, $level + 1) . ",\n";
+						$out .= "$space\t" . self::_dump($k, $level + 1) . ' => ' . self::_dump($v, $level + 1) . ",\n";
 					}
 				}
 				array_pop($list);
@@ -179,7 +179,7 @@ public static function formatMember($name)
 	{
 		return $name instanceof PhpLiteral || !self::isIdentifier($name)
 			? '{' . self::_dump($name) . '}'
-			: $name ;
+			: $name;
 	}
 
 
diff --git a/src/PhpGenerator/Parameter.php b/src/PhpGenerator/Parameter.php
index 59e5d0bb..6c6dd5bd 100644
--- a/src/PhpGenerator/Parameter.php
+++ b/src/PhpGenerator/Parameter.php
@@ -63,7 +63,7 @@ public static function from(\ReflectionParameter $from)
 		$param->defaultValue = (PHP_VERSION_ID === 50316 ? $from->isOptional() : $from->isDefaultValueAvailable()) ? $from->getDefaultValue() : NULL;
 
 		$namespace = $from->getDeclaringClass()->getNamespaceName();
-		$namespace = $namespace ? "\\$namespace\\" : "\\";
+		$namespace = $namespace ? "\\$namespace\\" : '\\';
 		if (Nette\Utils\Strings::startsWith($param->typeHint, $namespace)) {
 			$param->typeHint = substr($param->typeHint, strlen($namespace));
 		}
diff --git a/tests/PhpGenerator/ClassType.from.phpt b/tests/PhpGenerator/ClassType.from.phpt
index bd440d3f..77337b43 100644
--- a/tests/PhpGenerator/ClassType.from.phpt
+++ b/tests/PhpGenerator/ClassType.from.phpt
@@ -6,9 +6,9 @@
 
 namespace Abc;
 
-use Nette\PhpGenerator\ClassType,
-	ReflectionClass,
-	Tester\Assert;
+use Nette\PhpGenerator\ClassType;
+use ReflectionClass;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
diff --git a/tests/PhpGenerator/ClassType.from.trait.phpt b/tests/PhpGenerator/ClassType.from.trait.phpt
index 1c2f1f75..cb5539f6 100644
--- a/tests/PhpGenerator/ClassType.from.trait.phpt
+++ b/tests/PhpGenerator/ClassType.from.trait.phpt
@@ -5,8 +5,8 @@
  * @phpversion 5.4
  */
 
-use Nette\PhpGenerator\ClassType,
-	Tester\Assert;
+use Nette\PhpGenerator\ClassType;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
diff --git a/tests/PhpGenerator/ClassType.inheritance.phpt b/tests/PhpGenerator/ClassType.inheritance.phpt
index 93441050..3aad1bfc 100644
--- a/tests/PhpGenerator/ClassType.inheritance.phpt
+++ b/tests/PhpGenerator/ClassType.inheritance.phpt
@@ -1,8 +1,8 @@
 <?php
 
-use Nette\PhpGenerator\ClassType,
-	ReflectionClass,
-	Tester\Assert;
+use Nette\PhpGenerator\ClassType;
+use ReflectionClass;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -14,7 +14,9 @@ class A
 	protected $b;
 	private $c;
 
-	function foo() {}
+	function foo()
+	{
+	}
 }
 
 
@@ -24,7 +26,10 @@ class B extends A
 	protected $e;
 	private $f;
 
-	function bar() { return 3; }
+	function bar()
+	{
+		return 3;
+	}
 }
 
 
diff --git a/tests/PhpGenerator/ClassType.interface.phpt b/tests/PhpGenerator/ClassType.interface.phpt
index 1bbf9293..75dd4905 100644
--- a/tests/PhpGenerator/ClassType.interface.phpt
+++ b/tests/PhpGenerator/ClassType.interface.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\PhpGenerator for interfaces.
  */
 
-use Nette\PhpGenerator\ClassType,
-	Tester\Assert;
+use Nette\PhpGenerator\ClassType;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
diff --git a/tests/PhpGenerator/ClassType.phpt b/tests/PhpGenerator/ClassType.phpt
index bbe80e1e..5fbfeac8 100644
--- a/tests/PhpGenerator/ClassType.phpt
+++ b/tests/PhpGenerator/ClassType.phpt
@@ -4,9 +4,9 @@
  * Test: Nette\PhpGenerator for classes.
  */
 
-use Nette\PhpGenerator\ClassType,
-	Nette\PhpGenerator\PhpLiteral,
-	Tester\Assert;
+use Nette\PhpGenerator\ClassType;
+use Nette\PhpGenerator\PhpLiteral;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
diff --git a/tests/PhpGenerator/Helpers.dump().phpt b/tests/PhpGenerator/Helpers.dump().phpt
index 4b126eda..9520edf5 100644
--- a/tests/PhpGenerator/Helpers.dump().phpt
+++ b/tests/PhpGenerator/Helpers.dump().phpt
@@ -4,35 +4,35 @@
  * Test: Nette\PhpGenerator\Helpers::dump()
  */
 
-use Nette\PhpGenerator\Helpers,
-	Nette\PhpGenerator\PhpLiteral,
-	Tester\Assert;
+use Nette\PhpGenerator\Helpers;
+use Nette\PhpGenerator\PhpLiteral;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::same( '1', Helpers::dump(1) );
-Assert::same( '1.0', Helpers::dump(1.0) );
-Assert::same( 'NULL', Helpers::dump(NULL) );
-Assert::same( 'TRUE', Helpers::dump(TRUE) );
-Assert::same( 'FALSE', Helpers::dump(FALSE) );
+Assert::same('1', Helpers::dump(1));
+Assert::same('1.0', Helpers::dump(1.0));
+Assert::same('NULL', Helpers::dump(NULL));
+Assert::same('TRUE', Helpers::dump(TRUE));
+Assert::same('FALSE', Helpers::dump(FALSE));
 
-Assert::same( "''", Helpers::dump('') );
-Assert::same( "'Hello'", Helpers::dump('Hello') );
-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
-Assert::same( '"\rHello \$"', Helpers::dump("\rHello $") );
-Assert::same( 'array()', Helpers::dump(array()) );
+Assert::same("''", Helpers::dump(''));
+Assert::same("'Hello'", Helpers::dump('Hello'));
+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
+Assert::same('"\rHello \$"', Helpers::dump("\rHello $"));
+Assert::same('array()', Helpers::dump(array()));
 
-Assert::same( "array(\$s)", Helpers::dump(array(new PhpLiteral('$s'))) );
+Assert::same("array(\$s)", Helpers::dump(array(new PhpLiteral('$s'))));
 
-Assert::same( "array(1, 2, 3)", Helpers::dump(array(1,2,3)) );
-Assert::same( "array('a', 7 => 'b', 'c', '9a' => 'd', 'e')", Helpers::dump(array('a', 7 => 'b', 'c', '9a' => 'd', 9 => 'e')) );
-Assert::same( "array(\n\tarray(\n\t\t'a',\n\t\t'loooooooooooooooooooooooooooooooooong',\n\t),\n)", Helpers::dump(array(array('a', 'loooooooooooooooooooooooooooooooooong'))) );
-Assert::same( "array('a' => 1, array(\"\\r\" => \"\\r\", 2), 3)", Helpers::dump(array('a' => 1, array("\r" => "\r", 2), 3)) );
+Assert::same('array(1, 2, 3)', Helpers::dump(array(1, 2, 3)));
+Assert::same("array('a', 7 => 'b', 'c', '9a' => 'd', 'e')", Helpers::dump(array('a', 7 => 'b', 'c', '9a' => 'd', 9 => 'e')));
+Assert::same("array(\n\tarray(\n\t\t'a',\n\t\t'loooooooooooooooooooooooooooooooooong',\n\t),\n)", Helpers::dump(array(array('a', 'loooooooooooooooooooooooooooooooooong'))));
+Assert::same("array('a' => 1, array(\"\\r\" => \"\\r\", 2), 3)", Helpers::dump(array('a' => 1, array("\r" => "\r", 2), 3)));
 
-Assert::same( "(object) array(\n\t'a' => 1,\n\t'b' => 2,\n)", Helpers::dump((object) array('a' => 1, 'b' => 2)) );
-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))) );
+Assert::same("(object) array(\n\t'a' => 1,\n\t'b' => 2,\n)", Helpers::dump((object) array('a' => 1, 'b' => 2)));
+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))));
 
 
 class Test
@@ -42,8 +42,8 @@ class Test
 	private $c = 3;
 }
 
-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) );
-Assert::equal( new Test, eval('return ' . Helpers::dump(new Test) . ';') );
+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));
+Assert::equal(new Test, eval('return ' . Helpers::dump(new Test) . ';'));
 
 
 class Test2 extends Test
@@ -61,8 +61,8 @@ class Test2 extends Test
 	}
 }
 
-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) );
-Assert::equal( new Test2, eval('return ' . Helpers::dump(new Test2) . ';') );
+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));
+Assert::equal(new Test2, eval('return ' . Helpers::dump(new Test2) . ';'));
 
 
 class Test3 implements Serializable
@@ -79,5 +79,5 @@ class Test3 implements Serializable
 	}
 }
 
-Assert::same( 'unserialize(\'C:5:"Test3":0:{}\')', Helpers::dump(new Test3) );
-Assert::equal( new Test3, eval('return ' . Helpers::dump(new Test3) . ';') );
+Assert::same('unserialize(\'C:5:"Test3":0:{}\')', Helpers::dump(new Test3));
+Assert::equal(new Test3, eval('return ' . Helpers::dump(new Test3) . ';'));
diff --git a/tests/PhpGenerator/Helpers.format.phpt b/tests/PhpGenerator/Helpers.format.phpt
index 5909d313..199bf3ab 100644
--- a/tests/PhpGenerator/Helpers.format.phpt
+++ b/tests/PhpGenerator/Helpers.format.phpt
@@ -4,36 +4,36 @@
  * Test: Nette\PhpGenerator\Helpers::format() & formatArgs()
  */
 
-use Nette\PhpGenerator\Helpers,
-	Tester\Assert;
+use Nette\PhpGenerator\Helpers;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
 
 
-Assert::same( 'func', Helpers::format('func') );
-Assert::same( 'func(1)', Helpers::format('func(?)', 1, 2) );
+Assert::same('func', Helpers::format('func'));
+Assert::same('func(1)', Helpers::format('func(?)', 1, 2));
 
-Assert::same( 'func', Helpers::formatArgs('func', array(1, 2)) );
-Assert::same( 'func(1)', Helpers::formatArgs('func(?)', array(1, 2)) );
-Assert::same( "func(array(1, 2))", Helpers::formatArgs('func(?)', array(array(1, 2))) );
-Assert::same( 'func(1, 2)', Helpers::formatArgs('func(?*)', array(array(1, 2))) );
+Assert::same('func', Helpers::formatArgs('func', array(1, 2)));
+Assert::same('func(1)', Helpers::formatArgs('func(?)', array(1, 2)));
+Assert::same('func(array(1, 2))', Helpers::formatArgs('func(?)', array(array(1, 2))));
+Assert::same('func(1, 2)', Helpers::formatArgs('func(?*)', array(array(1, 2))));
 
-Assert::exception(function() {
+Assert::exception(function () {
 	Helpers::formatArgs('func(?*)', array(1, 2));
 }, 'Nette\InvalidArgumentException', 'Argument must be an array.');
 
-Assert::exception(function() {
+Assert::exception(function () {
 	Helpers::formatArgs('func(?, ?, ?)', array(1, 2));
 }, 'Nette\InvalidArgumentException', 'Insufficient number of arguments.');
 
-Assert::same( '$a = 2', Helpers::formatArgs('$? = ?', array('a', 2)) );
-Assert::same( '$obj->a = 2', Helpers::formatArgs('$obj->? = ?', array('a', 2)) );
-Assert::same( '$obj->{1} = 2', Helpers::formatArgs('$obj->? = ?', array(1, 2)) );
-Assert::same( '$obj->{\' \'} = 2', Helpers::formatArgs('$obj->? = ?', array(' ', 2)) );
+Assert::same('$a = 2', Helpers::formatArgs('$? = ?', array('a', 2)));
+Assert::same('$obj->a = 2', Helpers::formatArgs('$obj->? = ?', array('a', 2)));
+Assert::same('$obj->{1} = 2', Helpers::formatArgs('$obj->? = ?', array(1, 2)));
+Assert::same('$obj->{\' \'} = 2', Helpers::formatArgs('$obj->? = ?', array(' ', 2)));
 
-Assert::same( "Item", Helpers::formatMember('Item') );
-Assert::same( "{'0Item'}", Helpers::formatMember('0Item') );
+Assert::same('Item', Helpers::formatMember('Item'));
+Assert::same("{'0Item'}", Helpers::formatMember('0Item'));
 
-Assert::true( Helpers::isIdentifier('Item') );
-Assert::false( Helpers::isIdentifier('0Item') );
+Assert::true(Helpers::isIdentifier('Item'));
+Assert::false(Helpers::isIdentifier('0Item'));
diff --git a/tests/PhpGenerator/Method.closure.phpt b/tests/PhpGenerator/Method.closure.phpt
index 35310426..32989bb1 100644
--- a/tests/PhpGenerator/Method.closure.phpt
+++ b/tests/PhpGenerator/Method.closure.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\PhpGenerator & closure.
  */
 
-use Nette\PhpGenerator\Method,
-	Tester\Assert;
+use Nette\PhpGenerator\Method;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
diff --git a/tests/PhpGenerator/Method.variadics.phpt b/tests/PhpGenerator/Method.variadics.phpt
index 147e81a4..2d6450c7 100644
--- a/tests/PhpGenerator/Method.variadics.phpt
+++ b/tests/PhpGenerator/Method.variadics.phpt
@@ -5,9 +5,9 @@
  * @phpversion 5.6
  */
 
-use Nette\PhpGenerator\Method,
-	Nette\PhpGenerator\Parameter,
-	Tester\Assert;
+use Nette\PhpGenerator\Method;
+use Nette\PhpGenerator\Parameter;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';