Skip to content

Commit 78a872a

Browse files
dgdg
committed
improved coding style
1 parent d3e44f5 commit 78a872a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+380
-379
lines changed

‎src/Bridges/HttpDI/SessionExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function loadConfiguration()
4848

4949
if ($this->debugMode && $config['debugger']) {
5050
$session->addSetup('@Tracy\Bar::addPanel', [
51-
new Nette\DI\Statement('Nette\Bridges\HttpTracy\SessionPanel')
51+
new Nette\DI\Statement('Nette\Bridges\HttpTracy\SessionPanel'),
5252
]);
5353
}
5454

‎src/Http/IResponse.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ interface IResponse
4141
S303_POST_GET = 303,
4242
S304_NOT_MODIFIED = 304,
4343
S305_USE_PROXY = 305,
44-
S307_TEMPORARY_REDIRECT= 307,
44+
S307_TEMPORARY_REDIRECT = 307,
4545
S400_BAD_REQUEST = 400,
4646
S401_UNAUTHORIZED = 401,
4747
S402_PAYMENT_REQUIRED = 402,

‎src/Http/Request.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,8 @@ public function detectLanguage(array $langs)
319319
foreach ($matches[1] as $key => $value) {
320320
$q = $matches[2][$key] === '' ? 1.0 : (float) $matches[2][$key];
321321
if ($q > $max) {
322-
$max = $q; $lang = $value;
322+
$max = $q;
323+
$lang = $value;
323324
}
324325
}
325326

‎src/Http/RequestFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public function createHttpRequest()
213213
}
214214

215215
// raw body
216-
$rawBodyCallback = function() {
216+
$rawBodyCallback = function () {
217217
static $rawBody;
218218

219219
if (PHP_VERSION_ID >= 50600) {

‎src/Http/Response.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ private function checkHeaders()
291291
if (headers_sent($file, $line)) {
292292
throw new Nette\InvalidStateException('Cannot send header after HTTP headers have been sent' . ($file ? " (output started at $file:$line)." : '.'));
293293

294-
} elseif ($this->warnOnBuffer && ob_get_length() && !array_filter(ob_get_status(TRUE), function($i) { return !$i['chunk_size']; })) {
294+
} elseif ($this->warnOnBuffer && ob_get_length() && !array_filter(ob_get_status(TRUE), function ($i) { return !$i['chunk_size']; })) {
295295
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.', E_USER_NOTICE);
296296
}
297297
}

‎src/Http/Session.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ public function regenerateId()
224224
{
225225
if (self::$started && !$this->regenerated) {
226226
if (headers_sent($file, $line)) {
227-
throw new Nette\InvalidStateException("Cannot regenerate session ID after HTTP headers have been sent" . ($file ? " (output started at $file:$line)." : "."));
227+
throw new Nette\InvalidStateException('Cannot regenerate session ID after HTTP headers have been sent' . ($file ? " (output started at $file:$line)." : '.'));
228228
}
229229
session_regenerate_id(TRUE);
230230
session_write_close();
@@ -413,7 +413,7 @@ private function configure(array $config)
413413

414414
} else {
415415
if (defined('SID')) {
416-
throw new Nette\InvalidStateException("Unable to set 'session.$key' to value '$value' when session has been started" . ($this->started ? "." : " by session.auto_start or session_start()."));
416+
throw new Nette\InvalidStateException("Unable to set 'session.$key' to value '$value' when session has been started" . ($this->started ? '.' : ' by session.auto_start or session_start().'));
417417
}
418418
if (isset($special[$key])) {
419419
$key = "session_$key";
@@ -479,7 +479,7 @@ public function setCookieParameters($path, $domain = NULL, $secure = NULL)
479479
return $this->setOptions([
480480
'cookie_path' => $path,
481481
'cookie_domain' => $domain,
482-
'cookie_secure' => $secure
482+
'cookie_secure' => $secure,
483483
]);
484484
}
485485

‎src/Http/SessionSection.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class SessionSection extends Nette\Object implements \IteratorAggregate, \ArrayA
3939
public function __construct(Session $session, $name)
4040
{
4141
if (!is_string($name)) {
42-
throw new Nette\InvalidArgumentException("Session namespace must be a string, " . gettype($name) . " given.");
42+
throw new Nette\InvalidArgumentException('Session namespace must be a string, ' . gettype($name) . ' given.');
4343
}
4444

4545
$this->session = $session;

‎src/Http/Url.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ public function canonicalize()
443443
{
444444
$this->path = preg_replace_callback(
445445
'#[^!$&\'()*+,/:;=@%]+#',
446-
function($m) { return rawurlencode($m[0]); },
446+
function ($m) { return rawurlencode($m[0]); },
447447
self::unescape($this->path, '%/')
448448
);
449449
$this->host = strtolower($this->host);
@@ -474,7 +474,7 @@ public static function unescape($s, $reserved = '%;/?:@&=+$,')
474474
if ($reserved !== '') {
475475
$s = preg_replace_callback(
476476
'#%(' . substr(chunk_split(bin2hex($reserved), 2, '|'), 0, -1) . ')#i',
477-
function($m) { return '%25' . strtoupper($m[1]); },
477+
function ($m) { return '%25' . strtoupper($m[1]); },
478478
$s
479479
);
480480
}

‎src/Http/UserStorage.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class UserStorage extends Nette\Object implements Nette\Security\IUserStorage
2929
private $sessionSection;
3030

3131

32-
public function __construct(Session $sessionHandler)
32+
public function __construct(Session $sessionHandler)
3333
{
3434
$this->sessionHandler = $sessionHandler;
3535
}

‎tests/Http.DI/HttpExtension.defaultHeaders.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ $container = new Container1;
2424
$container->initialize();
2525

2626
$headers = headers_list();
27-
Assert::contains( 'X-Frame-Options: SAMEORIGIN', $headers );
28-
Assert::contains( 'Content-Type: text/html; charset=utf-8', $headers );
29-
Assert::contains( 'X-Powered-By: Nette Framework', $headers );
27+
Assert::contains('X-Frame-Options: SAMEORIGIN', $headers);
28+
Assert::contains('Content-Type: text/html; charset=utf-8', $headers);
29+
Assert::contains('X-Powered-By: Nette Framework', $headers);

‎tests/Http.DI/HttpExtension.headers.phpt

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ $container = new Container1;
3232
$container->initialize();
3333

3434
$headers = headers_list();
35-
Assert::contains( 'X-Frame-Options: SAMEORIGIN', $headers );
36-
Assert::contains( 'Content-Type: text/html; charset=utf-8', $headers );
37-
Assert::contains( 'X-Powered-By: Nette Framework', $headers );
38-
Assert::contains( 'A: b', $headers );
39-
Assert::notContains( 'C:', $headers );
35+
Assert::contains('X-Frame-Options: SAMEORIGIN', $headers);
36+
Assert::contains('Content-Type: text/html; charset=utf-8', $headers);
37+
Assert::contains('X-Powered-By: Nette Framework', $headers);
38+
Assert::contains('A: b', $headers);
39+
Assert::notContains('C:', $headers);
4040

4141

4242

4343
echo ' '; @ob_flush(); flush();
4444

45-
Assert::true( headers_sent() );
45+
Assert::true(headers_sent());
4646

47-
Assert::error(function() use ($container) {
47+
Assert::error(function () use ($container) {
4848
$container->initialize();
4949
}, [
5050
[E_WARNING, 'Cannot modify header information - headers already sent %a%'],

‎tests/Http/FileUpload.basic.phpt

+15-15
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use Nette\Http\FileUpload,
1111
require __DIR__ . '/../bootstrap.php';
1212

1313

14-
test(function() {
14+
test(function () {
1515
$upload = new FileUpload([
1616
'name' => 'readme.txt',
1717
'type' => 'text/plain',
@@ -20,19 +20,19 @@ test(function() {
2020
'size' => 209,
2121
]);
2222

23-
Assert::same( 'readme.txt', $upload->getName() );
24-
Assert::same( 'readme.txt', $upload->getSanitizedName() );
25-
Assert::same( 209, $upload->getSize() );
26-
Assert::same( __DIR__ . '/files/file.txt', $upload->getTemporaryFile() );
27-
Assert::same( __DIR__ . '/files/file.txt', (string) $upload );
28-
Assert::same( 0, $upload->getError() );
29-
Assert::true( $upload->isOk() );
30-
Assert::false( $upload->isImage() );
31-
Assert::same( file_get_contents(__DIR__ . '/files/file.txt'), $upload->getContents() );
23+
Assert::same('readme.txt', $upload->getName());
24+
Assert::same('readme.txt', $upload->getSanitizedName());
25+
Assert::same(209, $upload->getSize());
26+
Assert::same(__DIR__ . '/files/file.txt', $upload->getTemporaryFile());
27+
Assert::same(__DIR__ . '/files/file.txt', (string) $upload);
28+
Assert::same(0, $upload->getError());
29+
Assert::true($upload->isOk());
30+
Assert::false($upload->isImage());
31+
Assert::same(file_get_contents(__DIR__ . '/files/file.txt'), $upload->getContents());
3232
});
3333

3434

35-
test(function() {
35+
test(function () {
3636
$upload = new FileUpload([
3737
'name' => '../.image.png',
3838
'type' => 'text/plain',
@@ -41,8 +41,8 @@ test(function() {
4141
'size' => 209,
4242
]);
4343

44-
Assert::same( '../.image.png', $upload->getName() );
45-
Assert::same( 'image.png', $upload->getSanitizedName() );
46-
Assert::same( 'image/png', $upload->getContentType() );
47-
Assert::true( $upload->isImage() );
44+
Assert::same('../.image.png', $upload->getName());
45+
Assert::same('image.png', $upload->getSanitizedName());
46+
Assert::same('image/png', $upload->getContentType());
47+
Assert::true($upload->isImage());
4848
});

‎tests/Http/Helpers.phpt

+25-25
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,37 @@ use Nette\Http\Helpers,
1111
require __DIR__ . '/../bootstrap.php';
1212

1313

14-
test(function() {
15-
Assert::true( Helpers::ipMatch('192.168.68.233', '192.168.68.233') );
16-
Assert::false( Helpers::ipMatch('192.168.68.234', '192.168.68.233') );
17-
Assert::true( Helpers::ipMatch('192.168.64.0', '192.168.68.233/20') );
18-
Assert::false( Helpers::ipMatch('192.168.63.255', '192.168.68.233/20') );
19-
Assert::true( Helpers::ipMatch('192.168.79.254', '192.168.68.233/20') );
20-
Assert::false( Helpers::ipMatch('192.168.80.0', '192.168.68.233/20') );
21-
Assert::true( Helpers::ipMatch('127.0.0.1', '192.168.68.233/0') );
22-
Assert::false( Helpers::ipMatch('127.0.0.1', '192.168.68.233/33') );
23-
24-
Assert::false( Helpers::ipMatch('127.0.0.1', '7F00:0001::') );
14+
test(function () {
15+
Assert::true(Helpers::ipMatch('192.168.68.233', '192.168.68.233'));
16+
Assert::false(Helpers::ipMatch('192.168.68.234', '192.168.68.233'));
17+
Assert::true(Helpers::ipMatch('192.168.64.0', '192.168.68.233/20'));
18+
Assert::false(Helpers::ipMatch('192.168.63.255', '192.168.68.233/20'));
19+
Assert::true(Helpers::ipMatch('192.168.79.254', '192.168.68.233/20'));
20+
Assert::false(Helpers::ipMatch('192.168.80.0', '192.168.68.233/20'));
21+
Assert::true(Helpers::ipMatch('127.0.0.1', '192.168.68.233/0'));
22+
Assert::false(Helpers::ipMatch('127.0.0.1', '192.168.68.233/33'));
23+
24+
Assert::false(Helpers::ipMatch('127.0.0.1', '7F00:0001::'));
2525
});
2626

2727

2828

29-
test(function() {
30-
Assert::true( Helpers::ipMatch('2001:db8:0:0:0:0:0:0', '2001:db8::') );
31-
Assert::false( Helpers::ipMatch('2001:db8:0:0:0:0:0:0', '2002:db8::') );
32-
Assert::false( Helpers::ipMatch('2001:db8:0:0:0:0:0:1', '2001:db8::') );
33-
Assert::true( Helpers::ipMatch('2001:db8:0:0:0:0:0:0', '2001:db8::/48') );
34-
Assert::true( Helpers::ipMatch('2001:db8:0:ffff:ffff:ffff:ffff:ffff', '2001:db8::/48') );
35-
Assert::false( Helpers::ipMatch('2001:db8:1::', '2001:db8::/48') );
36-
Assert::false( Helpers::ipMatch('2001:db8:0:0:0:0:0:0', '2001:db8::/129') );
37-
Assert::false( Helpers::ipMatch('2001:db8:0:0:0:0:0:0', '32.1.13.184/32') );
29+
test(function () {
30+
Assert::true(Helpers::ipMatch('2001:db8:0:0:0:0:0:0', '2001:db8::'));
31+
Assert::false(Helpers::ipMatch('2001:db8:0:0:0:0:0:0', '2002:db8::'));
32+
Assert::false(Helpers::ipMatch('2001:db8:0:0:0:0:0:1', '2001:db8::'));
33+
Assert::true(Helpers::ipMatch('2001:db8:0:0:0:0:0:0', '2001:db8::/48'));
34+
Assert::true(Helpers::ipMatch('2001:db8:0:ffff:ffff:ffff:ffff:ffff', '2001:db8::/48'));
35+
Assert::false(Helpers::ipMatch('2001:db8:1::', '2001:db8::/48'));
36+
Assert::false(Helpers::ipMatch('2001:db8:0:0:0:0:0:0', '2001:db8::/129'));
37+
Assert::false(Helpers::ipMatch('2001:db8:0:0:0:0:0:0', '32.1.13.184/32'));
3838
});
3939

4040

4141

42-
test(function() {
43-
Assert::same( 'Tue, 15 Nov 1994 08:12:31 GMT', Helpers::formatDate('1994-11-15T08:12:31+0000') );
44-
Assert::same( 'Tue, 15 Nov 1994 08:12:31 GMT', Helpers::formatDate('1994-11-15T10:12:31+0200') );
45-
Assert::same( 'Tue, 15 Nov 1994 08:12:31 GMT', Helpers::formatDate(new DateTime('1994-11-15T06:12:31-0200')) );
46-
Assert::same( 'Tue, 15 Nov 1994 08:12:31 GMT', Helpers::formatDate(784887151) );
42+
test(function () {
43+
Assert::same('Tue, 15 Nov 1994 08:12:31 GMT', Helpers::formatDate('1994-11-15T08:12:31+0000'));
44+
Assert::same('Tue, 15 Nov 1994 08:12:31 GMT', Helpers::formatDate('1994-11-15T10:12:31+0200'));
45+
Assert::same('Tue, 15 Nov 1994 08:12:31 GMT', Helpers::formatDate(new DateTime('1994-11-15T06:12:31-0200')));
46+
Assert::same('Tue, 15 Nov 1994 08:12:31 GMT', Helpers::formatDate(784887151));
4747
});

‎tests/Http/Request.detectLanguage.phpt

+11-11
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,36 @@ use Nette\Http,
1111
require __DIR__ . '/../bootstrap.php';
1212

1313

14-
test(function() {
14+
test(function () {
1515
$headers = ['Accept-Language' => 'en, cs'];
1616
$request = new Http\Request(new Http\UrlScript, NULL, NULL, NULL, NULL, $headers);
1717

18-
Assert::same( 'en', $request->detectLanguage(['en', 'cs']) );
19-
Assert::same( 'en', $request->detectLanguage(['cs', 'en']) );
20-
Assert::null( $request->detectLanguage(['xx']) );
18+
Assert::same('en', $request->detectLanguage(['en', 'cs']));
19+
Assert::same('en', $request->detectLanguage(['cs', 'en']));
20+
Assert::null($request->detectLanguage(['xx']));
2121
});
2222

2323

24-
test(function() {
24+
test(function () {
2525
$headers = ['Accept-Language' => 'da, en-gb;q=0.8, en;q=0.7'];
2626
$request = new Http\Request(new Http\UrlScript, NULL, NULL, NULL, NULL, $headers);
2727

28-
Assert::same( 'en-gb', $request->detectLanguage(['en', 'en-gb']) );
29-
Assert::same( 'en', $request->detectLanguage(['en']) );
28+
Assert::same('en-gb', $request->detectLanguage(['en', 'en-gb']));
29+
Assert::same('en', $request->detectLanguage(['en']));
3030
});
3131

3232

33-
test(function() {
33+
test(function () {
3434
$headers = [];
3535
$request = new Http\Request(new Http\UrlScript, NULL, NULL, NULL, NULL, $headers);
3636

37-
Assert::null( $request->detectLanguage(['en']) );
37+
Assert::null($request->detectLanguage(['en']));
3838
});
3939

4040

41-
test(function() {
41+
test(function () {
4242
$headers = ['Accept-Language' => 'garbage'];
4343
$request = new Http\Request(new Http\UrlScript, NULL, NULL, NULL, NULL, $headers);
4444

45-
Assert::null( $request->detectLanguage(['en']) );
45+
Assert::null($request->detectLanguage(['en']));
4646
});

‎tests/Http/Request.files.phpt

+8-8
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ $_FILES = [
100100
$factory = new Http\RequestFactory;
101101
$request = $factory->createHttpRequest();
102102

103-
Assert::type( 'Nette\Http\FileUpload', $request->files['file1'] );
104-
Assert::type( 'Nette\Http\FileUpload', $request->files['file2'][2] );
105-
Assert::type( 'Nette\Http\FileUpload', $request->files['file3']['y']['z'] );
106-
Assert::type( 'Nette\Http\FileUpload', $request->files['file3'][1] );
103+
Assert::type('Nette\Http\FileUpload', $request->files['file1']);
104+
Assert::type('Nette\Http\FileUpload', $request->files['file2'][2]);
105+
Assert::type('Nette\Http\FileUpload', $request->files['file3']['y']['z']);
106+
Assert::type('Nette\Http\FileUpload', $request->files['file3'][1]);
107107

108-
Assert::false( isset($request->files['file0']) );
109-
Assert::true( isset($request->files['file1']) );
108+
Assert::false(isset($request->files['file0']));
109+
Assert::true(isset($request->files['file1']));
110110

111-
Assert::null( $request->getFile('empty1') );
112-
Assert::same( [NULL], $request->getFile('empty2') );
111+
Assert::null($request->getFile('empty1'));
112+
Assert::same([NULL], $request->getFile('empty2'));

‎tests/Http/Request.getRawBody.phpt

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ use Nette\Http,
1111
require __DIR__ . '/../bootstrap.php';
1212

1313

14-
test(function() {
15-
$request = new Http\Request(new Http\UrlScript, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, function() {
14+
test(function () {
15+
$request = new Http\Request(new Http\UrlScript, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, function () {
1616
return 'raw body';
1717
});
1818

19-
Assert::same( 'raw body', $request->getRawBody() );
19+
Assert::same('raw body', $request->getRawBody());
2020
});
2121

2222

23-
test(function() {
23+
test(function () {
2424
$request = new Http\Request(new Http\UrlScript);
2525

26-
Assert::null( $request->getRawBody() );
26+
Assert::null($request->getRawBody());
2727
});

‎tests/Http/Request.headers.phpt

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ use Nette\Http,
1111
require __DIR__ . '/../bootstrap.php';
1212

1313

14-
test(function() {
14+
test(function () {
1515
$request = new Http\Request(new Http\UrlScript);
1616
Assert::same([], $request->getHeaders());
1717
});
1818

19-
test(function() {
19+
test(function () {
2020
$request = new Http\Request(new Http\UrlScript, NULL, NULL, NULL, NULL, []);
2121
Assert::same([], $request->getHeaders());
2222
});
2323

24-
test(function() {
24+
test(function () {
2525
$request = new Http\Request(new Http\UrlScript, NULL, NULL, NULL, NULL, [
2626
'one' => '1',
2727
'TWO' => '2',

0 commit comments

Comments
 (0)