improved coding style

Author: dg

src/RobotLoader/RobotLoader.php

@@ -7,8 +7,8 @@
 
 namespace Nette\Loaders;
 
-use Nette,
-	Nette\Caching\Cache;
+use Nette;
+use Nette\Caching\Cache;
 
 
 /**
@@ -51,7 +51,7 @@ class RobotLoader extends Nette\Object
 	public function __construct()
 	{
 		if (!extension_loaded('tokenizer')) {
-			throw new Nette\NotSupportedException("PHP extension Tokenizer is not loaded.");
+			throw new Nette\NotSupportedException('PHP extension Tokenizer is not loaded.');
 		}
 	}
 
@@ -101,7 +101,7 @@ public function tryLoad($type)
 		}
 
 		if (isset($this->classes[$type]['file'])) {
-			call_user_func(function($file) { require $file; }, $this->classes[$type]['file']);
+			call_user_func(function ($file) { require $file; }, $this->classes[$type]['file']);
 		} else {
 			$this->missing[$type] = TRUE;
 		}
@@ -211,12 +211,12 @@ private function createFileIterator($dir)
 		}
 
 		$iterator = Nette\Utils\Finder::findFiles(is_array($this->acceptFiles) ? $this->acceptFiles : preg_split('#[,\s]+#', $this->acceptFiles))
-			->filter(function($file) use (& $disallow) {
+			->filter(function ($file) use (& $disallow) {
 				return !isset($disallow[$file->getPathname()]);
 			})
 			->from($dir)
 			->exclude($ignoreDirs)
-			->filter($filter = function($dir) use (& $disallow) {
+			->filter($filter = function ($dir) use (& $disallow) {
 				$path = $dir->getPathname();
 				if (is_file("$path/netterobots.txt")) {
 					foreach (file("$path/netterobots.txt") as $s) {

tests/Loaders/RobotLoader.phpt

@@ -4,9 +4,9 @@
  * Test: Nette\Loaders\RobotLoader basic usage.
  */
 
-use Nette\Loaders\RobotLoader,
-	Nette\Caching\Storages\DevNullStorage,
-	Tester\Assert;
+use Nette\Loaders\RobotLoader;
+use Nette\Caching\Storages\DevNullStorage;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -18,24 +18,28 @@ $loader->addDirectory(__DIR__ . '/files');
 $loader->addDirectory(__DIR__ . '/files/'); // purposely doubled
 $loader->addDirectory(__DIR__ . '/file/interface.php'); // as file
 $loader->addDirectory(__DIR__ . '/file/class.const.php');
-if (PHP_VERSION_ID >= 50400) $loader->addDirectory(__DIR__ . '/file/trait.php');
+if (PHP_VERSION_ID >= 50400) {
+	$loader->addDirectory(__DIR__ . '/file/trait.php');
+}
 $loader->addDirectory(__DIR__ . '/files.robots');
 $loader->register();
 
-Assert::false( class_exists('ConditionalClass') );   // files/conditional.class.php
-Assert::true( interface_exists('TestInterface') );   // file/interface.php
-if (PHP_VERSION_ID >= 50400) Assert::true( trait_exists('TestTrait') ); // file/trait.php
-
-Assert::true( class_exists('TestClass') );           // files/namespaces1.php
-Assert::true( class_exists('MySpace1\TestClass1') ); // files/namespaces1.php
-Assert::true( class_exists('MySpace2\TestClass2') ); // files/namespaces2.php
-Assert::true( class_exists('MySpace3\TestClass3') ); // files/namespaces2.php
-
-Assert::false( class_exists('Disallowed1') );   // files.robots\disallowed1\class.php
-Assert::false( class_exists('Disallowed2') );   // files.robots\disallowed2\class.php
-Assert::false( class_exists('Disallowed3') );   // files.robots\subdir\class.php
-Assert::true( class_exists('Allowed1') );       // files.robots\subdir\allowed.php
-Assert::false( class_exists('Disallowed4') );   // files.robots\subdir\disallowed4\class.php
-Assert::false( class_exists('Disallowed5') );   // files.robots\subdir\subdir2\disallowed5\class.php
-Assert::false( class_exists('Disallowed6') );   // files.robots\subdir\subdir2\class.php
-Assert::true( class_exists('Allowed2') );       // files.robots\subdir\subdir2\allowed.php
+Assert::false(class_exists('ConditionalClass'));   // files/conditional.class.php
+Assert::true(interface_exists('TestInterface'));   // file/interface.php
+if (PHP_VERSION_ID >= 50400) {
+	Assert::true(trait_exists('TestTrait'));
+} // file/trait.php
+
+Assert::true(class_exists('TestClass'));           // files/namespaces1.php
+Assert::true(class_exists('MySpace1\TestClass1')); // files/namespaces1.php
+Assert::true(class_exists('MySpace2\TestClass2')); // files/namespaces2.php
+Assert::true(class_exists('MySpace3\TestClass3')); // files/namespaces2.php
+
+Assert::false(class_exists('Disallowed1'));   // files.robots\disallowed1\class.php
+Assert::false(class_exists('Disallowed2'));   // files.robots\disallowed2\class.php
+Assert::false(class_exists('Disallowed3'));   // files.robots\subdir\class.php
+Assert::true(class_exists('Allowed1'));       // files.robots\subdir\allowed.php
+Assert::false(class_exists('Disallowed4'));   // files.robots\subdir\disallowed4\class.php
+Assert::false(class_exists('Disallowed5'));   // files.robots\subdir\subdir2\disallowed5\class.php
+Assert::false(class_exists('Disallowed6'));   // files.robots\subdir\subdir2\class.php
+Assert::true(class_exists('Allowed2'));       // files.robots\subdir\subdir2\allowed.php

tests/Loaders/RobotLoader.rebuild.phpt

@@ -4,9 +4,9 @@
  * Test: Nette\Loaders\RobotLoader rebuild only once.
  */
 
-use Nette\Loaders\RobotLoader,
-	Nette\Caching\Storages\DevNullStorage,
-	Tester\Assert;
+use Nette\Loaders\RobotLoader;
+use Nette\Caching\Storages\DevNullStorage;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -26,4 +26,4 @@ $a = new A;
 
 rename(TEMP_DIR . '/file2.php', TEMP_DIR . '/file4.php');
 
-Assert::false( class_exists('B') );
+Assert::false(class_exists('B'));

tests/Loaders/RobotLoader.renamed.phpt

@@ -4,9 +4,9 @@
  * Test: Nette\Loaders\RobotLoader and renamed classes.
  */
 
-use Nette\Loaders\RobotLoader,
-	Nette\Caching\Storages\DevNullStorage,
-	Tester\Assert;
+use Nette\Loaders\RobotLoader;
+use Nette\Caching\Storages\DevNullStorage;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';