coding style: fixes in code

dg · dg · commit 84d2b0a23f65 · 2017-07-21T18:54:52.000+02:00
diff --git a/src/Bridges/HttpDI/SessionExtension.php b/src/Bridges/HttpDI/SessionExtension.php
@@ -55,7 +55,7 @@ public function loadConfiguration()
 
 		if ($this->debugMode && $config['debugger']) {
 			$session->addSetup('@Tracy\Bar::addPanel', [
-				new Nette\DI\Statement(Nette\Bridges\HttpTracy\SessionPanel::class)
+				new Nette\DI\Statement(Nette\Bridges\HttpTracy\SessionPanel::class),
 			]);
 		}
 
diff --git a/src/Bridges/HttpTracy/templates/SessionPanel.panel.phtml b/src/Bridges/HttpTracy/templates/SessionPanel.panel.phtml
@@ -32,7 +32,7 @@ use Tracy\Dumper;
 		foreach ($_SESSION as $k => $v) {
 			if ($k === '__NF') {
 				$k = 'Nette Session';
-				$v = isset($v['DATA']) ? $v['DATA'] : null;
+				$v = $v['DATA'] ?? null;
 			} elseif ($k === '_tracy') {
 				continue;
 			}
diff --git a/src/Http/Request.php b/src/Http/Request.php
@@ -251,7 +251,7 @@ public function getRemoteAddress(): ?string
 	public function getRemoteHost(): ?string
 	{
 		if ($this->remoteHost === null && $this->remoteAddress !== null) {
-			$this->remoteHost = getHostByAddr($this->remoteAddress);
+			$this->remoteHost = gethostbyaddr($this->remoteAddress);
 		}
 		return $this->remoteHost;
 	}
diff --git a/src/Http/RequestFactory.php b/src/Http/RequestFactory.php
@@ -101,7 +101,7 @@ public function createHttpRequest(): Request
 		$url->setScriptPath($path);
 
 		// GET, POST, COOKIE
-		$useFilter = (!in_array(ini_get('filter.default'), ['', 'unsafe_raw']) || ini_get('filter.default_flags'));
+		$useFilter = (!in_array(ini_get('filter.default'), ['', 'unsafe_raw'], true) || ini_get('filter.default_flags'));
 
 		$query = $url->getQueryParameters();
 		$post = $useFilter ? filter_input_array(INPUT_POST, FILTER_UNSAFE_RAW) : (empty($_POST) ? [] : $_POST);
@@ -186,7 +186,7 @@ public function createHttpRequest(): Request
 				} elseif (strncmp($k, 'CONTENT_', 8)) {
 					continue;
 				}
-				$headers[ strtr($k, '_', '-') ] = $v;
+				$headers[strtr($k, '_', '-')] = $v;
 			}
 		}
 
diff --git a/src/Http/Response.php b/src/Http/Response.php
@@ -22,9 +22,6 @@ final class Response implements IResponse
 {
 	use Nette\SmartObject;
 
-	/** @var bool  Send invisible garbage for IE 6? */
-	private static $fixIE = true;
-
 	/** @var string The domain in which the cookie will be available */
 	public $cookieDomain = '';
 
@@ -40,6 +37,9 @@ final class Response implements IResponse
 	/** @var bool Whether warn on possible problem with data in output buffer */
 	public $warnOnBuffer = true;
 
+	/** @var bool  Send invisible garbage for IE 6? */
+	private static $fixIE = true;
+
 	/** @var int HTTP response code */
 	private $code = self::S200_OK;
 
@@ -145,7 +145,7 @@ public function redirect(string $url, int $code = self::S302_FOUND): void
 		$this->setCode($code);
 		$this->setHeader('Location', $url);
 		if (preg_match('#^https?:|^\s*+[a-z0-9+.-]*+[^:]#i', $url)) {
-			$escapedUrl = htmlSpecialChars($url, ENT_IGNORE | ENT_QUOTES, 'UTF-8');
+			$escapedUrl = htmlspecialchars($url, ENT_IGNORE | ENT_QUOTES, 'UTF-8');
 			echo "<h1>Redirect</h1>\n\n<p><a href=\"$escapedUrl\">Please click here to continue</a>.</p>";
 		}
 	}
diff --git a/src/Http/Session.php b/src/Http/Session.php
@@ -41,7 +41,7 @@ class Session
 		'cookie_path' => '/',     // cookie is available within the entire domain
 		'cookie_domain' => '',    // cookie is available on current subdomain only
 		'cookie_secure' => false, // cookie is available on HTTP & HTTPS
-		'cookie_httponly' => true,// must be enabled to prevent Session Hijacking
+		'cookie_httponly' => true, // must be enabled to prevent Session Hijacking
 
 		// other
 		'gc_maxlifetime' => self::DEFAULT_FILE_LIFETIME, // 3 hours
diff --git a/src/Http/SessionSection.php b/src/Http/SessionSection.php
@@ -19,6 +19,9 @@ class SessionSection implements \IteratorAggregate, \ArrayAccess
 {
 	use Nette\SmartObject;
 
+	/** @var bool */
+	public $warnOnUndefined = false;
+
 	/** @var Session */
 	private $session;
 
@@ -31,9 +34,6 @@ class SessionSection implements \IteratorAggregate, \ArrayAccess
 	/** @var array  session metadata storage */
 	private $meta = false;
 
-	/** @var bool */
-	public $warnOnUndefined = false;
-
 
 	/**
 	 * Do not call directly. Use Session::getSection().
diff --git a/tests/Http/Request.request.phpt b/tests/Http/Request.request.phpt
@@ -30,28 +30,28 @@ test(function () {
 	$factory->urlFilters['url'] = ['#[.,)]\z#' => ''];
 	$request = $factory->createHttpRequest();
 
-	Assert::same('GET',  $request->getMethod());
+	Assert::same('GET', $request->getMethod());
 	Assert::true($request->isSecured());
-	Assert::same('192.168.188.66',  $request->getRemoteAddress());
+	Assert::same('192.168.188.66', $request->getRemoteAddress());
 
-	Assert::same('/file.php',  $request->getUrl()->scriptPath);
-	Assert::same('https',  $request->getUrl()->scheme);
-	Assert::same('',  $request->getUrl()->user);
-	Assert::same('',  $request->getUrl()->password);
-	Assert::same('nette.org',  $request->getUrl()->host);
-	Assert::same(8080,  $request->getUrl()->port);
-	Assert::same('/file.php',  $request->getUrl()->path);
-	Assert::same('x_param=val.&pa%25ram=val2&quotes%5C%22=%5C%22&param3=v%20a%26l%3Du%2Be',  $request->getUrl()->query);
-	Assert::same('',  $request->getUrl()->fragment);
-	Assert::same('val.',  $request->getQuery('x_param'));
-	Assert::same('val2',  $request->getQuery('pa%ram'));
-	Assert::same('nette.org:8080',  $request->getUrl()->authority);
-	Assert::same('https://nette.org:8080',  $request->getUrl()->hostUrl);
-	Assert::same('https://nette.org:8080/',  $request->getUrl()->baseUrl);
-	Assert::same('/',  $request->getUrl()->basePath);
-	Assert::same('file.php?x_param=val.&pa%25ram=val2&quotes%5C%22=%5C%22&param3=v%20a%26l%3Du%2Be',  $request->getUrl()->relativeUrl);
-	Assert::same('https://nette.org:8080/file.php?x_param=val.&pa%25ram=val2&quotes%5C%22=%5C%22&param3=v%20a%26l%3Du%2Be',  $request->getUrl()->absoluteUrl);
-	Assert::same('',  $request->getUrl()->pathInfo);
+	Assert::same('/file.php', $request->getUrl()->scriptPath);
+	Assert::same('https', $request->getUrl()->scheme);
+	Assert::same('', $request->getUrl()->user);
+	Assert::same('', $request->getUrl()->password);
+	Assert::same('nette.org', $request->getUrl()->host);
+	Assert::same(8080, $request->getUrl()->port);
+	Assert::same('/file.php', $request->getUrl()->path);
+	Assert::same('x_param=val.&pa%25ram=val2&quotes%5C%22=%5C%22&param3=v%20a%26l%3Du%2Be', $request->getUrl()->query);
+	Assert::same('', $request->getUrl()->fragment);
+	Assert::same('val.', $request->getQuery('x_param'));
+	Assert::same('val2', $request->getQuery('pa%ram'));
+	Assert::same('nette.org:8080', $request->getUrl()->authority);
+	Assert::same('https://nette.org:8080', $request->getUrl()->hostUrl);
+	Assert::same('https://nette.org:8080/', $request->getUrl()->baseUrl);
+	Assert::same('/', $request->getUrl()->basePath);
+	Assert::same('file.php?x_param=val.&pa%25ram=val2&quotes%5C%22=%5C%22&param3=v%20a%26l%3Du%2Be', $request->getUrl()->relativeUrl);
+	Assert::same('https://nette.org:8080/file.php?x_param=val.&pa%25ram=val2&quotes%5C%22=%5C%22&param3=v%20a%26l%3Du%2Be', $request->getUrl()->absoluteUrl);
+	Assert::same('', $request->getUrl()->pathInfo);
 });
 
 
@@ -61,18 +61,18 @@ test(function () {
 	$factory->urlFilters['url'] = [];
 	$request = $factory->createHttpRequest();
 
-	Assert::same('https',  $request->getUrl()->scheme);
-	Assert::same('',  $request->getUrl()->user);
-	Assert::same('',  $request->getUrl()->password);
-	Assert::same('nette.org',  $request->getUrl()->host);
-	Assert::same(8080,  $request->getUrl()->port);
-	Assert::same('/file.php',  $request->getUrl()->path);
-	Assert::same('x_param=val.&pa%25ram=val2&quotes%5C%22=%5C%22&param3=v%20a%26l%3Du%2Be%29',  $request->getUrl()->query);
-	Assert::same('',  $request->getUrl()->fragment);
-	Assert::same('val.',  $request->getQuery('x_param'));
-	Assert::same('val2',  $request->getQuery('pa%ram'));
-	Assert::same('v a&l=u+e)',  $request->getQuery('param3'));
+	Assert::same('https', $request->getUrl()->scheme);
+	Assert::same('', $request->getUrl()->user);
+	Assert::same('', $request->getUrl()->password);
+	Assert::same('nette.org', $request->getUrl()->host);
+	Assert::same(8080, $request->getUrl()->port);
+	Assert::same('/file.php', $request->getUrl()->path);
+	Assert::same('x_param=val.&pa%25ram=val2&quotes%5C%22=%5C%22&param3=v%20a%26l%3Du%2Be%29', $request->getUrl()->query);
+	Assert::same('', $request->getUrl()->fragment);
+	Assert::same('val.', $request->getQuery('x_param'));
+	Assert::same('val2', $request->getQuery('pa%ram'));
+	Assert::same('v a&l=u+e)', $request->getQuery('param3'));
 	if (!function_exists('apache_request_headers')) {
-		Assert::same('nette.org:8080',  $request->headers['host']);
+		Assert::same('nette.org:8080', $request->headers['host']);
 	}
 });
diff --git a/tests/Http/RequestFactory.port.phpt b/tests/Http/RequestFactory.port.phpt
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 use Tester\Assert;
diff --git a/tests/Http/RequestFactory.scheme.phpt b/tests/Http/RequestFactory.scheme.phpt
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 use Tester\Assert;
diff --git a/tests/Http/Session.handler.phpt b/tests/Http/Session.handler.phpt
@@ -17,38 +17,38 @@ class MySessionStorage implements SessionHandlerInterface
 	private $path;
 
 
-	function open($savePath, $sessionName)
+	public function open($savePath, $sessionName)
 	{
 		$this->path = $savePath;
 		return true;
 	}
 
 
-	function close()
+	public function close()
 	{
 		return true;
 	}
 
 
-	function read($id)
+	public function read($id)
 	{
 		return (string) @file_get_contents("$this->path/sess_$id");
 	}
 
 
-	function write($id, $data)
+	public function write($id, $data)
 	{
 		return (bool) file_put_contents("$this->path/sess_$id", $data);
 	}
 
 
-	function destroy($id)
+	public function destroy($id)
 	{
 		return !is_file("$this->path/sess_$id") || @unlink("$this->path/sess_$id");
 	}
 
 
-	function gc($maxlifetime)
+	public function gc($maxlifetime)
 	{
 		foreach (glob("$this->path/sess_*") as $filename) {
 			if (filemtime($filename) + $maxlifetime < time()) {
diff --git a/tests/Http/SessionSection.basic.phpt b/tests/Http/SessionSection.basic.phpt
@@ -34,9 +34,9 @@ Assert::true(isset($namespace['p']));
 Assert::true(isset($namespace->o));
 Assert::false(isset($namespace->undefined));
 
-unset($namespace['a']);
-unset($namespace->p);
-unset($namespace->o);
-unset($namespace->undef);
+unset($namespace['a'], $namespace->p, $namespace->o, $namespace->undef);
+
+
+
 
 Assert::same('', http_build_query($namespace->getIterator()));
diff --git a/tests/Http/Url.domain.phpt b/tests/Http/Url.domain.phpt
@@ -1,5 +1,4 @@
 <?php
-
 declare(strict_types=1);
 
 use Nette\Http\Url;
diff --git a/tests/Http/Url.fileScheme.phpt b/tests/Http/Url.fileScheme.phpt
@@ -15,27 +15,27 @@ require __DIR__ . '/../bootstrap.php';
 
 test(function () {
 	$url = new Url('file://localhost/D:/dokumentace/rfc3986.txt');
-	Assert::same('file://localhost/D:/dokumentace/rfc3986.txt',  (string) $url);
-	Assert::same('file',  $url->scheme);
-	Assert::same('',  $url->user);
-	Assert::same('',  $url->password);
-	Assert::same('localhost',  $url->host);
+	Assert::same('file://localhost/D:/dokumentace/rfc3986.txt', (string) $url);
+	Assert::same('file', $url->scheme);
+	Assert::same('', $url->user);
+	Assert::same('', $url->password);
+	Assert::same('localhost', $url->host);
 	Assert::null($url->port);
-	Assert::same('/D:/dokumentace/rfc3986.txt',  $url->path);
-	Assert::same('',  $url->query);
-	Assert::same('',  $url->fragment);
+	Assert::same('/D:/dokumentace/rfc3986.txt', $url->path);
+	Assert::same('', $url->query);
+	Assert::same('', $url->fragment);
 });
 
 
 test(function () {
 	$url = new Url('file:///D:/dokumentace/rfc3986.txt');
-	Assert::same('file://D:/dokumentace/rfc3986.txt',  (string) $url);
-	Assert::same('file',  $url->scheme);
-	Assert::same('',  $url->user);
-	Assert::same('',  $url->password);
-	Assert::same('',  $url->host);
+	Assert::same('file://D:/dokumentace/rfc3986.txt', (string) $url);
+	Assert::same('file', $url->scheme);
+	Assert::same('', $url->user);
+	Assert::same('', $url->password);
+	Assert::same('', $url->host);
 	Assert::null($url->port);
-	Assert::same('D:/dokumentace/rfc3986.txt',  $url->path);
-	Assert::same('',  $url->query);
-	Assert::same('',  $url->fragment);
+	Assert::same('D:/dokumentace/rfc3986.txt', $url->path);
+	Assert::same('', $url->query);
+	Assert::same('', $url->fragment);
 });
diff --git a/tests/Http/Url.ftpScheme.phpt b/tests/Http/Url.ftpScheme.phpt
@@ -15,14 +15,14 @@ require __DIR__ . '/../bootstrap.php';
 
 $url = new Url('ftp://ftp.is.co.za/rfc/rfc3986.txt');
 
-Assert::same('ftp',  $url->scheme);
-Assert::same('',  $url->user);
-Assert::same('',  $url->password);
-Assert::same('ftp.is.co.za',  $url->host);
-Assert::same(21,  $url->port);
-Assert::same('/rfc/rfc3986.txt',  $url->path);
-Assert::same('',  $url->query);
-Assert::same('',  $url->fragment);
-Assert::same('ftp.is.co.za',  $url->authority);
-Assert::same('ftp://ftp.is.co.za',  $url->hostUrl);
-Assert::same('ftp://ftp.is.co.za/rfc/rfc3986.txt',  $url->absoluteUrl);
+Assert::same('ftp', $url->scheme);
+Assert::same('', $url->user);
+Assert::same('', $url->password);
+Assert::same('ftp.is.co.za', $url->host);
+Assert::same(21, $url->port);
+Assert::same('/rfc/rfc3986.txt', $url->path);
+Assert::same('', $url->query);
+Assert::same('', $url->fragment);
+Assert::same('ftp.is.co.za', $url->authority);
+Assert::same('ftp://ftp.is.co.za', $url->hostUrl);
+Assert::same('ftp://ftp.is.co.za/rfc/rfc3986.txt', $url->absoluteUrl);
diff --git a/tests/Http/Url.httpScheme.phpt b/tests/Http/Url.httpScheme.phpt
@@ -15,43 +15,43 @@ require __DIR__ . '/../bootstrap.php';
 
 $url = new Url('http://username%3A:password%3A@hostn%61me:60/p%61th/script.php?%61rg=value#%61nchor');
 
-Assert::same('http://hostname:60/p%61th/script.php?arg=value#anchor',  (string) $url);
-Assert::same('"http:\/\/hostname:60\/p%61th\/script.php?arg=value#anchor"',  json_encode($url));
-Assert::same('http',  $url->scheme);
-Assert::same('username:',  $url->user);
-Assert::same('password:',  $url->password);
-Assert::same('hostname',  $url->host);
-Assert::same(60,  $url->port);
-Assert::same('/p%61th/script.php',  $url->path);
-Assert::same('/p%61th/',  $url->basePath);
-Assert::same('arg=value',  $url->query);
-Assert::same('anchor',  $url->fragment);
-Assert::same('hostname:60',  $url->authority);
-Assert::same('http://hostname:60',  $url->hostUrl);
-Assert::same('http://hostname:60/p%61th/script.php?arg=value#anchor',  $url->absoluteUrl);
-Assert::same('http://hostname:60/p%61th/',  $url->baseUrl);
-Assert::same('script.php?arg=value#anchor',  $url->relativeUrl);
+Assert::same('http://hostname:60/p%61th/script.php?arg=value#anchor', (string) $url);
+Assert::same('"http:\/\/hostname:60\/p%61th\/script.php?arg=value#anchor"', json_encode($url));
+Assert::same('http', $url->scheme);
+Assert::same('username:', $url->user);
+Assert::same('password:', $url->password);
+Assert::same('hostname', $url->host);
+Assert::same(60, $url->port);
+Assert::same('/p%61th/script.php', $url->path);
+Assert::same('/p%61th/', $url->basePath);
+Assert::same('arg=value', $url->query);
+Assert::same('anchor', $url->fragment);
+Assert::same('hostname:60', $url->authority);
+Assert::same('http://hostname:60', $url->hostUrl);
+Assert::same('http://hostname:60/p%61th/script.php?arg=value#anchor', $url->absoluteUrl);
+Assert::same('http://hostname:60/p%61th/', $url->baseUrl);
+Assert::same('script.php?arg=value#anchor', $url->relativeUrl);
 
 $url->setPath('');
-Assert::same('/',  $url->getPath());
+Assert::same('/', $url->getPath());
 
 $url->setPath('/');
-Assert::same('/',  $url->getPath());
+Assert::same('/', $url->getPath());
 
 $url->setPath('x');
-Assert::same('/x',  $url->getPath());
+Assert::same('/x', $url->getPath());
 
 $url->setPath('/x');
-Assert::same('/x',  $url->getPath());
+Assert::same('/x', $url->getPath());
 
 $url->setScheme('');
-Assert::same('//username%3A:password%3A@hostname:60/x?arg=value#anchor',  $url->absoluteUrl);
+Assert::same('//username%3A:password%3A@hostname:60/x?arg=value#anchor', $url->absoluteUrl);
 
 $url->setPath('');
-Assert::same('/',  $url->getPath());
+Assert::same('/', $url->getPath());
 
 $url->setHost('')->setPath('');
-Assert::same('?arg=value#anchor',  $url->absoluteUrl);
+Assert::same('?arg=value#anchor', $url->absoluteUrl);
 
 $url->setPath('');
-Assert::same('',  $url->getPath());
+Assert::same('', $url->getPath());
diff --git a/tests/Http/Url.query.phpt b/tests/Http/Url.query.phpt
diff --git a/tests/Http/UrlScript.modify.phpt b/tests/Http/UrlScript.modify.phpt
diff --git a/tests/Http/UrlScript.parse.phpt b/tests/Http/UrlScript.parse.phpt
diff --git a/tests/bootstrap.php b/tests/bootstrap.php

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function loadConfiguration()`
`55`	`55`
`56`	`56`	`if ($this->debugMode && $config['debugger']) {`
`57`	`57`	`$session->addSetup('@Tracy\Bar::addPanel', [`
`58`		`- new Nette\DI\Statement(Nette\Bridges\HttpTracy\SessionPanel::class)`
	`58`	`+ new Nette\DI\Statement(Nette\Bridges\HttpTracy\SessionPanel::class),`
`59`	`59`	`]);`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ use Tracy\Dumper;`
`32`	`32`	`foreach ($_SESSION as $k => $v) {`
`33`	`33`	`if ($k === '__NF') {`
`34`	`34`	`$k = 'Nette Session';`
`35`		`- $v = isset($v['DATA']) ? $v['DATA'] : null;`
	`35`	`+ $v = $v['DATA'] ?? null;`
`36`	`36`	`} elseif ($k === '_tracy') {`
`37`	`37`	`continue;`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ public function getRemoteAddress(): ?string`
`251`	`251`	`public function getRemoteHost(): ?string`
`252`	`252`	`{`
`253`	`253`	`if ($this->remoteHost === null && $this->remoteAddress !== null) {`
`254`		`- $this->remoteHost = getHostByAddr($this->remoteAddress);`
	`254`	`+ $this->remoteHost = gethostbyaddr($this->remoteAddress);`
`255`	`255`	`}`
`256`	`256`	`return $this->remoteHost;`
`257`	`257`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public function createHttpRequest(): Request`
`101`	`101`	`$url->setScriptPath($path);`
`102`	`102`
`103`	`103`	`// GET, POST, COOKIE`
`104`		`- $useFilter = (!in_array(ini_get('filter.default'), ['', 'unsafe_raw']) \|\| ini_get('filter.default_flags'));`
	`104`	`+ $useFilter = (!in_array(ini_get('filter.default'), ['', 'unsafe_raw'], true) \|\| ini_get('filter.default_flags'));`
`105`	`105`
`106`	`106`	`$query = $url->getQueryParameters();`
`107`	`107`	`$post = $useFilter ? filter_input_array(INPUT_POST, FILTER_UNSAFE_RAW) : (empty($_POST) ? [] : $_POST);`
`@@ -186,7 +186,7 @@ public function createHttpRequest(): Request`
`186`	`186`	`} elseif (strncmp($k, 'CONTENT_', 8)) {`
`187`	`187`	`continue;`
`188`	`188`	`}`
`189`		`- $headers[ strtr($k, '_', '-') ] = $v;`
	`189`	`+ $headers[strtr($k, '_', '-')] = $v;`
`190`	`190`	`}`
`191`	`191`	`}`
`192`	`192`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<?php`
`2`		`-`
`3`	`2`	`declare(strict_types=1);`
`4`	`3`
`5`	`4`	`use Tester\Assert;`