diff --git a/src/Application/IPresenterFactory.php b/src/Application/IPresenterFactory.php
index 74f356fce..68d281c61 100644
--- a/src/Application/IPresenterFactory.php
+++ b/src/Application/IPresenterFactory.php
@@ -20,7 +20,7 @@ interface IPresenterFactory
 	 * @return string  class name
 	 * @throws InvalidPresenterException
 	 */
-	function getPresenterClass(& $name);
+	function getPresenterClass(&$name);
 
 	/**
 	 * Creates new presenter instance.
diff --git a/src/Application/PresenterFactory.php b/src/Application/PresenterFactory.php
index eddce740f..c3a8338eb 100644
--- a/src/Application/PresenterFactory.php
+++ b/src/Application/PresenterFactory.php
@@ -56,7 +56,7 @@ public function createPresenter($name)
 	 * @return string  class name
 	 * @throws InvalidPresenterException
 	 */
-	public function getPresenterClass(& $name)
+	public function getPresenterClass(&$name)
 	{
 		if (isset($this->cache[$name])) {
 			return $this->cache[$name];
diff --git a/src/Application/UI/Component.php b/src/Application/UI/Component.php
index 21203abf9..dcb43360d 100644
--- a/src/Application/UI/Component.php
+++ b/src/Application/UI/Component.php
@@ -154,7 +154,7 @@ public function loadState(array $params)
 	 * @param  ComponentReflection (internal, used by Presenter)
 	 * @return void
 	 */
-	public function saveState(array & $params, $reflection = NULL)
+	public function saveState(array &$params, $reflection = NULL)
 	{
 		$reflection = $reflection === NULL ? $this->getReflection() : $reflection;
 		foreach ($reflection->getPersistentParams() as $name => $meta) {
diff --git a/src/Application/UI/ComponentReflection.php b/src/Application/UI/ComponentReflection.php
index 85a759236..dce1bfd26 100644
--- a/src/Application/UI/ComponentReflection.php
+++ b/src/Application/UI/ComponentReflection.php
@@ -161,7 +161,7 @@ public static function combineArgs(\ReflectionFunctionAbstract $method, $args)
 	 * @param  string
 	 * @return bool
 	 */
-	public static function convertType(& $val, $type, $isClass = FALSE)
+	public static function convertType(&$val, $type, $isClass = FALSE)
 	{
 		if ($isClass) {
 			return $val instanceof $type;
diff --git a/src/Application/UI/IStatePersistent.php b/src/Application/UI/IStatePersistent.php
index 240d8d2d1..5e463344c 100644
--- a/src/Application/UI/IStatePersistent.php
+++ b/src/Application/UI/IStatePersistent.php
@@ -24,6 +24,6 @@ function loadState(array $params);
 	 * Saves state informations for next request.
 	 * @return void
 	 */
-	function saveState(array & $params);
+	function saveState(array &$params);
 
 }
diff --git a/src/Application/UI/Presenter.php b/src/Application/UI/Presenter.php
index 7404fd527..190c4c77c 100644
--- a/src/Application/UI/Presenter.php
+++ b/src/Application/UI/Presenter.php
@@ -1006,7 +1006,7 @@ protected function createRequest($component, $destination, array $args, $mode)
 	 * @throws InvalidLinkException
 	 * @internal
 	 */
-	public static function argsToParams($class, $method, & $args, $supplemental = [], & $missing = [])
+	public static function argsToParams($class, $method, &$args, $supplemental = [], &$missing = [])
 	{
 		$i = 0;
 		$rm = new \ReflectionMethod($class, $method);
@@ -1136,7 +1136,7 @@ public static function getPersistentComponents()
 	 */
 	protected function getGlobalState($forClass = NULL)
 	{
-		$sinces = & $this->globalStateSinces;
+		$sinces = &$this->globalStateSinces;
 
 		if ($this->globalState === NULL) {
 			$state = [];
diff --git a/src/Bridges/ApplicationLatte/UIRuntime.php b/src/Bridges/ApplicationLatte/UIRuntime.php
index c6a2ffce3..13e626b87 100644
--- a/src/Bridges/ApplicationLatte/UIRuntime.php
+++ b/src/Bridges/ApplicationLatte/UIRuntime.php
@@ -22,7 +22,7 @@ class UIRuntime
 	/**
 	 * @return void
 	 */
-	public static function initialize(Latte\Runtime\Template $template, & $parentName, array $blocks)
+	public static function initialize(Latte\Runtime\Template $template, &$parentName, array $blocks)
 	{
 		$providers = $template->global;
 		$blocks = array_filter(array_keys($blocks), function ($s) { return $s[0] !== '_'; });
diff --git a/tests/Application/MicroPresenter.invoke.phpt b/tests/Application/MicroPresenter.invoke.phpt
index f5cdeb965..4e993666c 100644
--- a/tests/Application/MicroPresenter.invoke.phpt
+++ b/tests/Application/MicroPresenter.invoke.phpt
@@ -24,7 +24,7 @@ test(function () {
 	$presenter = $p = new NetteModule\MicroPresenter;
 
 	$presenter->run(new Request('Nette:Micro', 'GET', [
-		'callback' => function ($id, $page, $presenter) use ($p, & $log) {
+		'callback' => function ($id, $page, $presenter) use ($p, &$log) {
 			Assert::same($p, $presenter);
 			$log[] = 'Callback id ' . $id . ' page ' . $page;
 		},
@@ -60,7 +60,7 @@ test(function () {
 	$presenter = new NetteModule\MicroPresenter($container);
 
 	$presenter->run(new Request('Nette:Micro', 'GET', [
-		'callback' => function (stdClass $obj) use (& $log) {
+		'callback' => function (stdClass $obj) use (&$log) {
 			$log[] = get_class($obj);
 		},
 	]));
diff --git a/tests/Responses/CallbackResponse.phpt b/tests/Responses/CallbackResponse.phpt
index 83ac423f8..53dad69b2 100644
--- a/tests/Responses/CallbackResponse.phpt
+++ b/tests/Responses/CallbackResponse.phpt
@@ -13,7 +13,7 @@ require __DIR__ . '/../bootstrap.php';
 
 
 test(function () {
-	$response = new CallbackResponse(function (Http\IRequest $request, Http\IResponse $response) use (& $ok) {
+	$response = new CallbackResponse(function (Http\IRequest $request, Http\IResponse $response) use (&$ok) {
 		$ok = TRUE;
 	});
 	$response->send(new Http\Request(new Http\UrlScript), new Http\Response);
diff --git a/tests/UI/Presenter.link().php7.phpt b/tests/UI/Presenter.link().php7.phpt
index 567fee47a..b2ee49fa2 100644
--- a/tests/UI/Presenter.link().php7.phpt
+++ b/tests/UI/Presenter.link().php7.phpt
@@ -34,7 +34,7 @@ class TestControl extends Application\UI\Control
 		parent::loadState($params);
 	}
 
-	public function saveState(array & $params)
+	public function saveState(array &$params)
 	{
 		parent::saveState($params);
 		if (isset($params['order'])) {
diff --git a/tests/UI/Presenter.link().php71.phpt b/tests/UI/Presenter.link().php71.phpt
index 7797155a3..713e7e807 100644
--- a/tests/UI/Presenter.link().php71.phpt
+++ b/tests/UI/Presenter.link().php71.phpt
@@ -34,7 +34,7 @@ class TestControl extends Application\UI\Control
 		parent::loadState($params);
 	}
 
-	public function saveState(array & $params)
+	public function saveState(array &$params)
 	{
 		parent::saveState($params);
 		if (isset($params['order'])) {
diff --git a/tests/UI/Presenter.link().phpt b/tests/UI/Presenter.link().phpt
index 6764b3946..7b706e828 100644
--- a/tests/UI/Presenter.link().phpt
+++ b/tests/UI/Presenter.link().phpt
@@ -33,7 +33,7 @@ class TestControl extends Application\UI\Control
 		parent::loadState($params);
 	}
 
-	public function saveState(array & $params)
+	public function saveState(array &$params)
 	{
 		parent::saveState($params);
 		if (isset($params['order'])) {