coding style: fixed spaces & use statements order

dg · dg · commit c24dcad65b26 · 2017-07-11T13:48:05.000+02:00
diff --git a/src/Bridges/HttpDI/HttpExtension.php b/src/Bridges/HttpDI/HttpExtension.php
@@ -108,5 +108,4 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 			}
 		}
 	}
-
 }
diff --git a/src/Bridges/HttpDI/SessionExtension.php b/src/Bridges/HttpDI/SessionExtension.php
@@ -85,5 +85,4 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 			$initialize->addBody('$this->getService(?)->start();', [$name]);
 		}
 	}
-
 }
diff --git a/src/Bridges/HttpTracy/SessionPanel.php b/src/Bridges/HttpTracy/SessionPanel.php
@@ -40,5 +40,4 @@ public function getPanel()
 		require __DIR__ . '/templates/SessionPanel.panel.phtml';
 		return ob_get_clean();
 	}
-
 }
diff --git a/src/Bridges/HttpTracy/templates/SessionPanel.panel.phtml b/src/Bridges/HttpTracy/templates/SessionPanel.panel.phtml
@@ -31,7 +31,8 @@ use Tracy\Dumper;
 		<?php
 		foreach ($_SESSION as $k => $v) {
 			if ($k === '__NF') {
-				$k = 'Nette Session'; $v = isset($v['DATA']) ? $v['DATA'] : NULL;
+				$k = 'Nette Session';
+				$v = isset($v['DATA']) ? $v['DATA'] : NULL;
 			} elseif ($k === '_tracy') {
 				continue;
 			}
diff --git a/src/Http/Context.php b/src/Http/Context.php
@@ -97,5 +97,4 @@ public function getResponse()
 	{
 		return $this->response;
 	}
-
 }
diff --git a/src/Http/FileUpload.php b/src/Http/FileUpload.php
@@ -215,5 +215,4 @@ public function getContents()
 		// future implementation can try to work around safe_mode and open_basedir limitations
 		return $this->isOk() ? file_get_contents($this->tmpName) : NULL;
 	}
-
 }
diff --git a/src/Http/Helpers.php b/src/Http/Helpers.php
@@ -71,5 +71,4 @@ public static function removeDuplicateCookies()
 			header($header, $key === 0);
 		}
 	}
-
 }
diff --git a/src/Http/IRequest.php b/src/Http/IRequest.php
@@ -135,5 +135,4 @@ function getRemoteHost();
 	 * @return string|NULL
 	 */
 	function getRawBody();
-
 }
diff --git a/src/Http/IResponse.php b/src/Http/IResponse.php
@@ -176,5 +176,4 @@ function setCookie($name, $value, $expire, $path = NULL, $domain = NULL, $secure
 	 * @return void
 	 */
 	function deleteCookie($name, $path = NULL, $domain = NULL, $secure = NULL);
-
 }
diff --git a/src/Http/ISessionStorage.php b/src/Http/ISessionStorage.php
@@ -15,7 +15,6 @@
  */
 interface ISessionStorage
 {
-
 	function open($savePath, $sessionName);
 
 	function close();
@@ -27,5 +26,4 @@ function write($id, $data);
 	function remove($id);
 
 	function clean($maxlifetime);
-
 }
diff --git a/src/Http/Request.php b/src/Http/Request.php
@@ -326,5 +326,4 @@ public function detectLanguage(array $langs)
 
 		return $lang;
 	}
-
 }
diff --git a/src/Http/RequestFactory.php b/src/Http/RequestFactory.php
@@ -279,5 +279,4 @@ public function createHttpRequest()
 
 		return new Request($url, NULL, $post, $files, $cookies, $headers, $method, $remoteAddr, $remoteHost, $rawBodyCallback);
 	}
-
 }
diff --git a/src/Http/Response.php b/src/Http/Response.php
@@ -47,7 +47,6 @@ public function __construct()
 		if (is_int($code = http_response_code())) {
 			$this->code = $code;
 		}
-
 	}
 
 
@@ -298,13 +297,11 @@ public function deleteCookie($name, $path = NULL, $domain = NULL, $secure = NULL
 	private function checkHeaders()
 	{
 		if (PHP_SAPI === 'cli') {
-
 		} elseif (headers_sent($file, $line)) {
 			throw new Nette\InvalidStateException('Cannot send header after HTTP headers have been sent' . ($file ? " (output started at $file:$line)." : '.'));
 
 		} elseif ($this->warnOnBuffer && ob_get_length() && !array_filter(ob_get_status(TRUE), function ($i) { return !$i['chunk_size']; })) {
 			trigger_error('Possible problem: you are sending a HTTP header while already having some data in output buffer. Try Tracy\OutputDebugger or start session earlier.');
 		}
 	}
-
 }
diff --git a/src/Http/Session.php b/src/Http/Session.php
@@ -539,5 +539,4 @@ private function sendCookie()
 			$cookie['path'], $cookie['domain'], $cookie['secure'], $cookie['httponly']
 		);
 	}
-
 }
diff --git a/src/Http/SessionSection.php b/src/Http/SessionSection.php
@@ -220,5 +220,4 @@ public function remove()
 		$this->data = NULL;
 		$this->meta = NULL;
 	}
-
 }
diff --git a/src/Http/Url.php b/src/Http/Url.php
@@ -513,5 +513,4 @@ public static function parseQuery($s)
 		parse_str($s, $res);
 		return $res;
 	}
-
 }
diff --git a/src/Http/UrlScript.php b/src/Http/UrlScript.php
@@ -78,5 +78,4 @@ public function getPathInfo()
 	{
 		return (string) substr($this->getPath(), strlen($this->getScriptPath()));
 	}
-
 }
diff --git a/src/Http/UserStorage.php b/src/Http/UserStorage.php
@@ -189,5 +189,4 @@ protected function getSessionSection($need)
 
 		return $this->sessionSection;
 	}
-
 }
diff --git a/tests/Http.DI/HttpExtension.defaultHeaders.phpt b/tests/Http.DI/HttpExtension.defaultHeaders.phpt
@@ -4,8 +4,8 @@
  * Test: HttpExtension.
  */
 
-use Nette\DI;
 use Nette\Bridges\HttpDI\HttpExtension;
+use Nette\DI;
 use Tester\Assert;
 
 
diff --git a/tests/Http.DI/HttpExtension.headers.phpt b/tests/Http.DI/HttpExtension.headers.phpt
@@ -4,8 +4,8 @@
  * Test: HttpExtension.
  */
 
-use Nette\DI;
 use Nette\Bridges\HttpDI\HttpExtension;
+use Nette\DI;
 use Tester\Assert;
 
 
diff --git a/tests/Http.DI/HttpExtension.services.phpt b/tests/Http.DI/HttpExtension.services.phpt
@@ -4,8 +4,8 @@
  * Test: HttpExtension.
  */
 
-use Nette\DI;
 use Nette\Bridges\HttpDI\HttpExtension;
+use Nette\DI;
 use Tester\Assert;
 
 
diff --git a/tests/Http.DI/SessionExtension.autoStart.phpt b/tests/Http.DI/SessionExtension.autoStart.phpt
@@ -4,9 +4,9 @@
  * Test: SessionExtension.
  */
 
-use Nette\DI;
 use Nette\Bridges\HttpDI\HttpExtension;
 use Nette\Bridges\HttpDI\SessionExtension;
+use Nette\DI;
 use Tester\Assert;
 
 
diff --git a/tests/Http.DI/SessionExtension.config.phpt b/tests/Http.DI/SessionExtension.config.phpt
@@ -4,9 +4,9 @@
  * Test: SessionExtension.
  */
 
-use Nette\DI;
 use Nette\Bridges\HttpDI\HttpExtension;
 use Nette\Bridges\HttpDI\SessionExtension;
+use Nette\DI;
 use Tester\Assert;
 
 
diff --git a/tests/Http/RequestFactory.port.phpt b/tests/Http/RequestFactory.port.phpt
@@ -21,6 +21,7 @@ class RequestFactoryPortTest extends Tester\TestCase
 		Assert::same($expectedPort, $factory->createHttpRequest()->getUrl()->getPort());
 	}
 
+
 	/**
 	 * @return array
 	 */
@@ -48,6 +49,7 @@ class RequestFactoryPortTest extends Tester\TestCase
 		];
 	}
 
+
 	/**
 	 * @dataProvider providerCreateHttpRequestWithTrustedProxy
 	 */
@@ -60,6 +62,7 @@ class RequestFactoryPortTest extends Tester\TestCase
 		Assert::same($expectedPort, $factory->createHttpRequest()->getUrl()->getPort());
 	}
 
+
 	/**
 	 * @return array
 	 */
@@ -78,7 +81,6 @@ class RequestFactoryPortTest extends Tester\TestCase
 			[44443, ['HTTPS' => 'on', 'SERVER_NAME' => 'localhost:666', 'HTTP_X_FORWARDED_PORT' => '44443']],
 		];
 	}
-
 }
 
 $test = new RequestFactoryPortTest();
diff --git a/tests/Http/RequestFactory.scheme.phpt b/tests/Http/RequestFactory.scheme.phpt
@@ -80,7 +80,6 @@ class RequestFactorySchemeTest extends Tester\TestCase
 			['https', 80, ['SERVER_NAME' => 'localhost:80', 'HTTPS' => 'off', 'HTTP_X_FORWARDED_PROTO' => 'https', 'HTTP_X_FORWARDED_PORT' => '80']],
 		];
 	}
-
 }
 
 
diff --git a/tests/Http/Session.SessionHandler.phpt b/tests/Http/Session.SessionHandler.phpt
@@ -4,7 +4,6 @@
  * Test: Nette\Http\Session storage.
  */
 
-use Nette\Http\Session;
 use Tester\Assert;
 
 
diff --git a/tests/Http/Session.handler-exceptions.phpt b/tests/Http/Session.handler-exceptions.phpt
@@ -5,7 +5,6 @@
  */
 
 use Nette\Http;
-use Nette\Http\Session;
 use Tester\Assert;
 
 
@@ -14,7 +13,6 @@ require __DIR__ . '/../bootstrap.php';
 
 class ThrowsOnReadHandler extends \SessionHandler
 {
-
 	public function open($save_path, $session_id)
 	{
 		return TRUE; // never throw an exception from here, the universe might implode
@@ -25,7 +23,6 @@ class ThrowsOnReadHandler extends \SessionHandler
 	{
 		throw new RuntimeException("Session can't be started for whatever reason!");
 	}
-
 }
 
 
diff --git a/tests/Http/Session.handler.phpt b/tests/Http/Session.handler.phpt
@@ -4,7 +4,6 @@
  * Test: Nette\Http\Session storage.
  */
 
-use Nette\Http\Session;
 use Tester\Assert;
 
 
@@ -15,32 +14,38 @@ class MySessionStorage implements SessionHandlerInterface
 {
 	private $path;
 
+
 	function open($savePath, $sessionName)
 	{
 		$this->path = $savePath;
 		return TRUE;
 	}
 
+
 	function close()
 	{
 		return TRUE;
 	}
 
+
 	function read($id)
 	{
 		return (string) @file_get_contents("$this->path/sess_$id");
 	}
 
+
 	function write($id, $data)
 	{
 		return (bool) file_put_contents("$this->path/sess_$id", $data);
 	}
 
+
 	function destroy($id)
 	{
 		return !is_file("$this->path/sess_$id") || @unlink("$this->path/sess_$id");
 	}
 
+
 	function gc($maxlifetime)
 	{
 		foreach (glob("$this->path/sess_*") as $filename) {
diff --git a/tests/Http/Session.invalidId.phpt b/tests/Http/Session.invalidId.phpt
@@ -5,7 +5,6 @@
  */
 
 use Nette\Http\Session;
-use Nette\Http\SessionSection;
 use Tester\Assert;
 
 
diff --git a/tests/Http/Session.sections.phpt b/tests/Http/Session.sections.phpt
@@ -5,7 +5,6 @@
  */
 
 use Nette\Http\Session;
-use Nette\Http\SessionSection;
 use Tester\Assert;
 
 
diff --git a/tests/Http/Session.setOptions.phpt b/tests/Http/Session.setOptions.phpt
@@ -4,7 +4,6 @@
  * Test: Nette\Http\Session setOptions.
  */
 
-use Nette\Http\Session;
 use Tester\Assert;
 
 
diff --git a/tests/Http/Session.start.error.phpt b/tests/Http/Session.start.error.phpt
@@ -5,7 +5,6 @@
  */
 
 use Nette\Http\Session;
-use Nette\Http\SessionSection;
 use Tester\Assert;
 
 
diff --git a/tests/Http/Session.storage.phpt b/tests/Http/Session.storage.phpt
@@ -16,32 +16,38 @@ class MySessionStorage implements ISessionStorage
 {
 	private $path;
 
+
 	function open($savePath, $sessionName)
 	{
 		$this->path = $savePath;
 		return TRUE;
 	}
 
+
 	function close()
 	{
 		return TRUE;
 	}
 
+
 	function read($id)
 	{
 		return (string) @file_get_contents("$this->path/sess_$id");
 	}
 
+
 	function write($id, $data)
 	{
 		return (bool) file_put_contents("$this->path/sess_$id", $data);
 	}
 
+
 	function remove($id)
 	{
 		return !is_file("$this->path/sess_$id") || @unlink("$this->path/sess_$id");
 	}
 
+
 	function clean($maxlifetime)
 	{
 		foreach (glob("$this->path/sess_*") as $filename) {

Original file line number	Diff line number	Diff line change
`@@ -108,5 +108,4 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`}`
`111`		`-`
`112`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,5 +85,4 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)`
`85`	`85`	`$initialize->addBody('$this->getService(?)->start();', [$name]);`
`86`	`86`	`}`
`87`	`87`	`}`
`88`		`-`
`89`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,4 @@ public function getPanel()`
`40`	`40`	`require __DIR__ . '/templates/SessionPanel.panel.phtml';`
`41`	`41`	`return ob_get_clean();`
`42`	`42`	`}`
`43`		`-`
`44`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,5 +97,4 @@ public function getResponse()`
`97`	`97`	`{`
`98`	`98`	`return $this->response;`
`99`	`99`	`}`
`100`		`-`
`101`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -215,5 +215,4 @@ public function getContents()`
`215`	`215`	`// future implementation can try to work around safe_mode and open_basedir limitations`
`216`	`216`	`return $this->isOk() ? file_get_contents($this->tmpName) : NULL;`
`217`	`217`	`}`
`218`		`-`
`219`	`218`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,4 @@ public static function removeDuplicateCookies()`
`71`	`71`	`header($header, $key === 0);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`		`-`
`75`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,5 +135,4 @@ function getRemoteHost();`
`135`	`135`	`* @return string\|NULL`
`136`	`136`	`*/`
`137`	`137`	`function getRawBody();`
`138`		`-`
`139`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -176,5 +176,4 @@ function setCookie($name, $value, $expire, $path = NULL, $domain = NULL, $secure`
`176`	`176`	`* @return void`
`177`	`177`	`*/`
`178`	`178`	`function deleteCookie($name, $path = NULL, $domain = NULL, $secure = NULL);`
`179`		`-`
`180`	`179`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`*/`
`16`	`16`	`interface ISessionStorage`
`17`	`17`	`{`
`18`		`-`
`19`	`18`	`function open($savePath, $sessionName);`
`20`	`19`
`21`	`20`	`function close();`
`@@ -27,5 +26,4 @@ function write($id, $data);`
`27`	`26`	`function remove($id);`
`28`	`27`
`29`	`28`	`function clean($maxlifetime);`
`30`		`-`
`31`	`29`	`}`