Skip to content

Commit 7dafbec

Browse files
dgdg
committed
improved coding style
1 parent 52b3b5b commit 7dafbec

File tree

6 files changed

+55
-51
lines changed

6 files changed

+55
-51
lines changed

‎src/RobotLoader/RobotLoader.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
namespace Nette\Loaders;
99

10-
use Nette,
11-
Nette\Caching\Cache,
12-
SplFileInfo;
10+
use Nette;
11+
use Nette\Caching\Cache;
12+
use SplFileInfo;
1313

1414

1515
/**
@@ -52,7 +52,7 @@ class RobotLoader extends Nette\Object
5252
public function __construct()
5353
{
5454
if (!extension_loaded('tokenizer')) {
55-
throw new Nette\NotSupportedException("PHP extension Tokenizer is not loaded.");
55+
throw new Nette\NotSupportedException('PHP extension Tokenizer is not loaded.');
5656
}
5757
}
5858

@@ -106,7 +106,7 @@ public function tryLoad($type)
106106
if ($this->classes[$type]['orig'] !== $orig) {
107107
trigger_error("Case mismatch on class name '$orig', correct name is '{$this->classes[$type]['orig']}'.", E_USER_WARNING);
108108
}
109-
call_user_func(function($file) { require $file; }, $this->classes[$type]['file']);
109+
call_user_func(function ($file) { require $file; }, $this->classes[$type]['file']);
110110
} else {
111111
$this->missing[$type] = TRUE;
112112
}
@@ -211,12 +211,12 @@ private function createFileIterator($dir)
211211
}
212212

213213
$iterator = Nette\Utils\Finder::findFiles(is_array($this->acceptFiles) ? $this->acceptFiles : preg_split('#[,\s]+#', $this->acceptFiles))
214-
->filter(function(SplFileInfo $file) use (& $disallow) {
214+
->filter(function (SplFileInfo $file) use (& $disallow) {
215215
return !isset($disallow[$file->getPathname()]);
216216
})
217217
->from($dir)
218218
->exclude($ignoreDirs)
219-
->filter($filter = function(SplFileInfo $dir) use (& $disallow) {
219+
->filter($filter = function (SplFileInfo $dir) use (& $disallow) {
220220
$path = $dir->getPathname();
221221
if (is_file("$path/netterobots.txt")) {
222222
foreach (file("$path/netterobots.txt") as $s) {

‎tests/Loaders/RobotLoader.caseSensitivity.phpt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* Test: Nette\Loaders\RobotLoader case sensitivity.
55
*/
66

7-
use Nette\Loaders\RobotLoader,
8-
Nette\Caching\Storages\DevNullStorage,
9-
Tester\Assert;
7+
use Nette\Loaders\RobotLoader;
8+
use Nette\Caching\Storages\DevNullStorage;
9+
use Tester\Assert;
1010

1111

1212
require __DIR__ . '/../bootstrap.php';
@@ -17,6 +17,6 @@ $loader->setCacheStorage(new DevNullStorage);
1717
$loader->addDirectory(__DIR__ . '/files');
1818
$loader->register();
1919

20-
Assert::error(function(){
21-
Assert::true( class_exists('testClass') );
20+
Assert::error(function () {
21+
Assert::true(class_exists('testClass'));
2222
}, E_USER_WARNING, "Case mismatch on class name 'testClass', correct name is 'TestClass'.");

‎tests/Loaders/RobotLoader.phar.phpt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
* @phpIni phar.readonly=0
77
*/
88

9-
use Nette\Loaders\RobotLoader,
10-
Nette\Caching\Storages\DevNullStorage,
11-
Tester\Assert;
9+
use Nette\Loaders\RobotLoader;
10+
use Nette\Caching\Storages\DevNullStorage;
11+
use Tester\Assert;
1212

1313

1414
require __DIR__ . '/../bootstrap.php';
@@ -24,34 +24,34 @@ $phar['sub/class.D.php'] = '<?php class D {}';
2424
$phar->setStub('<?php __HALT_COMPILER();');
2525
unset($phar);
2626

27-
Assert::true( is_file($pharFile) );
27+
Assert::true(is_file($pharFile));
2828
Phar::loadPhar($pharFile, 'test.phar');
2929

3030

3131
$loader = new RobotLoader;
3232
$loader->setCacheStorage(new DevNullStorage);
3333
$loader->addDirectory("phar://$pharFile/sub");
3434
$loader->addDirectory("PHAR://$pharFile/class.B.php");
35-
$loader->addDirectory("phar://test.phar/class.C.php");
35+
$loader->addDirectory('phar://test.phar/class.C.php');
3636
$loader->register();
3737

38-
Assert::false( class_exists('A') );
39-
Assert::true( class_exists('B') );
40-
Assert::true( class_exists('C') );
41-
Assert::true( class_exists('D') );
38+
Assert::false(class_exists('A'));
39+
Assert::true(class_exists('B'));
40+
Assert::true(class_exists('C'));
41+
Assert::true(class_exists('D'));
4242

4343

4444
$loader = new RobotLoader;
4545
$loader->setCacheStorage(new DevNullStorage);
4646
$loader->addDirectory("phar://$pharFile/non-dir");
47-
Assert::exception(function() use ($loader, $pharFile) {
47+
Assert::exception(function () use ($loader, $pharFile) {
4848
$loader->register();
4949
}, 'Nette\IOException', "File or directory 'phar://$pharFile/non-dir' not found.");
5050

5151

5252
$loader = new RobotLoader;
5353
$loader->setCacheStorage(new DevNullStorage);
5454
$loader->addDirectory("phar://$pharFile/non-file.php");
55-
Assert::exception(function() use ($loader, $pharFile) {
55+
Assert::exception(function () use ($loader, $pharFile) {
5656
$loader->register();
5757
}, 'Nette\IOException', "File or directory 'phar://$pharFile/non-file.php' not found.");

‎tests/Loaders/RobotLoader.phpt‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* Test: Nette\Loaders\RobotLoader basic usage.
55
*/
66

7-
use Nette\Loaders\RobotLoader,
8-
Nette\Caching\Storages\DevNullStorage,
9-
Tester\Assert;
7+
use Nette\Loaders\RobotLoader;
8+
use Nette\Caching\Storages\DevNullStorage;
9+
use Tester\Assert;
1010

1111

1212
require __DIR__ . '/../bootstrap.php';
@@ -18,24 +18,28 @@ $loader->addDirectory(__DIR__ . '/files');
1818
$loader->addDirectory(__DIR__ . '/files/'); // purposely doubled
1919
$loader->addDirectory(__DIR__ . '/file/interface.php'); // as file
2020
$loader->addDirectory(__DIR__ . '/file/class.const.php');
21-
if (PHP_VERSION_ID >= 50400) $loader->addDirectory(__DIR__ . '/file/trait.php');
21+
if (PHP_VERSION_ID >= 50400) {
22+
$loader->addDirectory(__DIR__ . '/file/trait.php');
23+
}
2224
$loader->addDirectory(__DIR__ . '/files.robots');
2325
$loader->register();
2426

25-
Assert::false( class_exists('ConditionalClass') ); // files/conditional.class.php
26-
Assert::true( interface_exists('TestInterface') ); // file/interface.php
27-
if (PHP_VERSION_ID >= 50400) Assert::true( trait_exists('TestTrait') ); // file/trait.php
28-
29-
Assert::true( class_exists('TestClass') ); // files/namespaces1.php
30-
Assert::true( class_exists('MySpace1\TestClass1') ); // files/namespaces1.php
31-
Assert::true( class_exists('MySpace2\TestClass2') ); // files/namespaces2.php
32-
Assert::true( class_exists('MySpace3\TestClass3') ); // files/namespaces2.php
33-
34-
Assert::false( class_exists('Disallowed1') ); // files.robots\disallowed1\class.php
35-
Assert::false( class_exists('Disallowed2') ); // files.robots\disallowed2\class.php
36-
Assert::false( class_exists('Disallowed3') ); // files.robots\subdir\class.php
37-
Assert::true( class_exists('Allowed1') ); // files.robots\subdir\allowed.php
38-
Assert::false( class_exists('Disallowed4') ); // files.robots\subdir\disallowed4\class.php
39-
Assert::false( class_exists('Disallowed5') ); // files.robots\subdir\subdir2\disallowed5\class.php
40-
Assert::false( class_exists('Disallowed6') ); // files.robots\subdir\subdir2\class.php
41-
Assert::true( class_exists('Allowed2') ); // files.robots\subdir\subdir2\allowed.php
27+
Assert::false(class_exists('ConditionalClass')); // files/conditional.class.php
28+
Assert::true(interface_exists('TestInterface')); // file/interface.php
29+
if (PHP_VERSION_ID >= 50400) {
30+
Assert::true(trait_exists('TestTrait'));
31+
} // file/trait.php
32+
33+
Assert::true(class_exists('TestClass')); // files/namespaces1.php
34+
Assert::true(class_exists('MySpace1\TestClass1')); // files/namespaces1.php
35+
Assert::true(class_exists('MySpace2\TestClass2')); // files/namespaces2.php
36+
Assert::true(class_exists('MySpace3\TestClass3')); // files/namespaces2.php
37+
38+
Assert::false(class_exists('Disallowed1')); // files.robots\disallowed1\class.php
39+
Assert::false(class_exists('Disallowed2')); // files.robots\disallowed2\class.php
40+
Assert::false(class_exists('Disallowed3')); // files.robots\subdir\class.php
41+
Assert::true(class_exists('Allowed1')); // files.robots\subdir\allowed.php
42+
Assert::false(class_exists('Disallowed4')); // files.robots\subdir\disallowed4\class.php
43+
Assert::false(class_exists('Disallowed5')); // files.robots\subdir\subdir2\disallowed5\class.php
44+
Assert::false(class_exists('Disallowed6')); // files.robots\subdir\subdir2\class.php
45+
Assert::true(class_exists('Allowed2')); // files.robots\subdir\subdir2\allowed.php

‎tests/Loaders/RobotLoader.rebuild.phpt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* Test: Nette\Loaders\RobotLoader rebuild only once.
55
*/
66

7-
use Nette\Loaders\RobotLoader,
8-
Nette\Caching\Storages\DevNullStorage,
9-
Tester\Assert;
7+
use Nette\Loaders\RobotLoader;
8+
use Nette\Caching\Storages\DevNullStorage;
9+
use Tester\Assert;
1010

1111

1212
require __DIR__ . '/../bootstrap.php';
@@ -26,4 +26,4 @@ $a = new A;
2626

2727
rename(TEMP_DIR . '/file2.php', TEMP_DIR . '/file4.php');
2828

29-
Assert::false( class_exists('B') );
29+
Assert::false(class_exists('B'));

‎tests/Loaders/RobotLoader.renamed.phpt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* Test: Nette\Loaders\RobotLoader and renamed classes.
55
*/
66

7-
use Nette\Loaders\RobotLoader,
8-
Nette\Caching\Storages\DevNullStorage,
9-
Tester\Assert;
7+
use Nette\Loaders\RobotLoader;
8+
use Nette\Caching\Storages\DevNullStorage;
9+
use Tester\Assert;
1010

1111

1212
require __DIR__ . '/../bootstrap.php';

0 commit comments

Comments
 (0)