improved coding style

nette · Jun 19, 2015 · 1d7d277 · 1d7d277
1 parent 58ed2d8
commit 1d7d277
Show file tree

Hide file tree

Showing 90 changed files with 739 additions and 737 deletions.
diff --git a/src/Bridges/DITracy/ContainerPanel.php b/src/Bridges/DITracy/ContainerPanel.php
@@ -7,9 +7,9 @@
 
 namespace Nette\Bridges\DITracy;
 
-use Nette,
-	Nette\DI\Container,
-	Tracy;
+use Nette;
+use Nette\DI\Container;
+use Tracy;
 
 
 /**

diff --git a/src/DI/Compiler.php b/src/DI/Compiler.php
@@ -7,8 +7,8 @@
 
 namespace Nette\DI;
 
-use Nette,
-	Nette\Utils\Validators;
+use Nette;
+use Nette\Utils\Validators;
 
 
 /**
@@ -60,7 +60,7 @@ public function addExtension($name, CompilerExtension $extension)
 	public function getExtensions($type = NULL)
 	{
 		return $type
-			? array_filter($this->extensions, function($item) use ($type) { return $item instanceof $type; })
+			? array_filter($this->extensions, function ($item) use ($type) { return $item instanceof $type; })
 			: $this->extensions;
 	}
 

diff --git a/src/DI/Config/Adapters/IniAdapter.php b/src/DI/Config/Adapters/IniAdapter.php
@@ -7,8 +7,8 @@
 
 namespace Nette\DI\Config\Adapters;
 
-use Nette,
-	Nette\DI\Config\Helpers;
+use Nette;
+use Nette\DI\Config\Helpers;
 
 
 /**

diff --git a/src/DI/Config/Adapters/NeonAdapter.php b/src/DI/Config/Adapters/NeonAdapter.php
@@ -7,10 +7,10 @@
 
 namespace Nette\DI\Config\Adapters;
 
-use Nette,
-	Nette\DI\Config\Helpers,
-	Nette\DI\Statement,
-	Nette\Neon;
+use Nette;
+use Nette\DI\Config\Helpers;
+use Nette\DI\Statement;
+use Nette\Neon;
 
 
 /**

diff --git a/src/DI/Config/Loader.php b/src/DI/Config/Loader.php
@@ -7,8 +7,8 @@
 
 namespace Nette\DI\Config;
 
-use Nette,
-	Nette\Utils\Validators;
+use Nette;
+use Nette\Utils\Validators;
 
 
 /**

diff --git a/src/DI/ContainerBuilder.php b/src/DI/ContainerBuilder.php
@@ -7,11 +7,11 @@
 
 namespace Nette\DI;
 
-use Nette,
-	Nette\Utils\Validators,
-	Nette\Utils\Strings,
-	Nette\PhpGenerator\Helpers as PhpHelpers,
-	ReflectionClass;
+use Nette;
+use Nette\Utils\Validators;
+use Nette\Utils\Strings;
+use Nette\PhpGenerator\Helpers as PhpHelpers;
+use ReflectionClass;
 
 
 /**
@@ -757,7 +757,7 @@ public function formatStatement(Statement $statement)
 	 */
 	public function formatPhp($statement, $args)
 	{
-		array_walk_recursive($args, function(& $val) {
+		array_walk_recursive($args, function (& $val) {
 			if ($val instanceof Statement) {
 				$val = self::literal($this->formatStatement($val));
 

diff --git a/src/DI/ContainerLoader.php b/src/DI/ContainerLoader.php
@@ -33,7 +33,7 @@ public function __construct($tempDirectory, $autoRebuild = FALSE)
 
 	/**
 	 * @param  mixed
-	 * @param  callable  function(Nette\DI\Compiler $compiler): string|NULL
+	 * @param  callable  function (Nette\DI\Compiler $compiler): string|NULL
 	 * @return string
 	 */
 	public function load($key, $generator)

diff --git a/src/DI/Extensions/DIExtension.php b/src/DI/Extensions/DIExtension.php
@@ -53,7 +53,7 @@ public function afterCompile(Nette\PhpGenerator\ClassType $class)
 		if ($this->debugMode && $this->config['debugger']) {
 			Nette\Bridges\DITracy\ContainerPanel::$compilationTime = $this->time;
 			$initialize->addBody($container->formatPhp('?;', [
-				new Nette\DI\Statement('@Tracy\Bar::addPanel', [new Nette\DI\Statement('Nette\Bridges\DITracy\ContainerPanel')])
+				new Nette\DI\Statement('@Tracy\Bar::addPanel', [new Nette\DI\Statement('Nette\Bridges\DITracy\ContainerPanel')]),
 			]));
 		}
 

diff --git a/src/DI/Extensions/DecoratorExtension.php b/src/DI/Extensions/DecoratorExtension.php
@@ -7,8 +7,8 @@
 
 namespace Nette\DI\Extensions;
 
-use Nette,
-	Nette\DI\Statement;
+use Nette;
+use Nette\DI\Statement;
 
 
 /**
@@ -61,7 +61,7 @@ public function addTags($type, array $tags)
 	private function findByType($type)
 	{
 		$type = ltrim($type, '\\');
-		return array_filter($this->getContainerBuilder()->getDefinitions(), function($def) use ($type) {
+		return array_filter($this->getContainerBuilder()->getDefinitions(), function ($def) use ($type) {
 			return $def->getClass() === $type || is_subclass_of($def->getClass(), $type);
 		});
 	}

diff --git a/src/DI/Extensions/InjectExtension.php b/src/DI/Extensions/InjectExtension.php
@@ -7,9 +7,9 @@
 
 namespace Nette\DI\Extensions;
 
-use Nette,
-	Nette\DI,
-	Nette\DI\PhpReflection;
+use Nette;
+use Nette\DI;
+use Nette\DI\PhpReflection;
 
 
 /**
@@ -67,7 +67,7 @@ private function updateDefinition($def)
 	 */
 	public static function getInjectMethods($class)
 	{
-		return array_values(array_filter(get_class_methods($class), function($name) {
+		return array_values(array_filter(get_class_methods($class), function ($name) {
 			return substr($name, 0, 6) === 'inject';
 		}));
 	}

diff --git a/tests/DI/Compiler.addExtension.phpt b/tests/DI/Compiler.addExtension.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\DI\Compiler and addExtension on loadConfiguration stage.
  */
 
-use Nette\DI,
-	Tester\Assert;
+use Nette\DI;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -20,14 +20,14 @@ class FooExtension extends DI\CompilerExtension
 }
 
 
-Assert::exception(function() {
+Assert::exception(function () {
 	$compiler = new DI\Compiler;
 	$compiler->addExtension('foo', new FooExtension);
 	$container = createContainer($compiler);
 }, 'Nette\DeprecatedException', "Extensions 'bar' were added while container was being compiled.");
 
 
-Assert::exception(function() {
+Assert::exception(function () {
 	$compiler = new DI\Compiler;
 	$compiler->addExtension('foo', new FooExtension);
 	$compiler->addExtension('foo', new FooExtension);

diff --git a/tests/DI/Compiler.arguments.phpt b/tests/DI/Compiler.arguments.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\DI\Compiler: arguments in config.
  */
 
-use Nette\DI,
-	Tester\Assert;
+use Nette\DI;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -26,7 +26,7 @@ class Lorem
 
 	function method()
 	{
-		$this->args[]  = func_get_args();
+		$this->args[] = func_get_args();
 	}
 
 	function add($a, $b)
@@ -36,7 +36,7 @@ class Lorem
 
 }
 
-define('MY_CONSTANT_TEST', "one");
+define('MY_CONSTANT_TEST', 'one');
 
 
 Assert::error(function () use (& $container) {
@@ -63,23 +63,23 @@ $lorem = $container->getService('lorem');
 $dolor = $container->getService('dolor');
 
 // constants
-Assert::same( ['one', Lorem::DOLOR_SIT, 'MY_FAILING_CONSTANT_TEST'], $lorem->args[0] );
-Assert::same( [NULL], $dolor->args[0] );
+Assert::same(['one', Lorem::DOLOR_SIT, 'MY_FAILING_CONSTANT_TEST'], $lorem->args[0]);
+Assert::same([NULL], $dolor->args[0]);
 
 // services
-Assert::same( [$lorem, $lorem, $container], $lorem->args[1] );
+Assert::same([$lorem, $lorem, $container], $lorem->args[1]);
 
 // statements
-Assert::same( [3, ['x' => 'HELLO']], $lorem->args[2] );
+Assert::same([3, ['x' => 'HELLO']], $lorem->args[2]);
 
 // non-statements
-Assert::same( [['Lorem', 'method'], 'Lorem::add', 'Lorem::add'], $lorem->args[3] );
+Assert::same([['Lorem', 'method'], 'Lorem::add', 'Lorem::add'], $lorem->args[3]);
 
 // special
-Assert::same( [FALSE], $lorem->args[4] );
+Assert::same([FALSE], $lorem->args[4]);
 
 // service variables
-Assert::same( [$lorem->var, $lorem->var, $container->parameters], $lorem->args[5] );
+Assert::same([$lorem->var, $lorem->var, $container->parameters], $lorem->args[5]);
 
 // service constant
-Assert::same( [Lorem::DOLOR_SIT, Lorem::DOLOR_SIT, DI\Container::TAGS], $lorem->args[6] );
+Assert::same([Lorem::DOLOR_SIT, Lorem::DOLOR_SIT, DI\Container::TAGS], $lorem->args[6]);
diff --git a/tests/DI/Compiler.config.phpt b/tests/DI/Compiler.config.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\DI\Compiler and config.
  */
 
-use Nette\DI,
-	Tester\Assert;
+use Nette\DI;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';

diff --git a/tests/DI/Compiler.dependencies.phpt b/tests/DI/Compiler.dependencies.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\DI\Compiler and dependencies.
  */
 
-use Nette\DI,
-	Tester\Assert;
+use Nette\DI;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';

diff --git a/tests/DI/Compiler.extension.defaultServices.phpt b/tests/DI/Compiler.extension.defaultServices.phpt
@@ -4,8 +4,8 @@
  * Test: Working with user defined services in CompilerExtension.
  */
 
-use Nette\DI,
-	Tester\Assert;
+use Nette\DI;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -81,9 +81,9 @@ services:
 ');
 
 
-Assert::type( 'Foo', $container->getService('one') );
-Assert::type( 'Bar', $container->getService('two') );
-Assert::type( 'Lorem', $container->getService('three') );
-Assert::type( 'IIpsumFactory', $container->getService('four') );
+Assert::type('Foo', $container->getService('one'));
+Assert::type('Bar', $container->getService('two'));
+Assert::type('Lorem', $container->getService('three'));
+Assert::type('IIpsumFactory', $container->getService('four'));
 
-Assert::type( 'FooBar', $container->getByType('IFooBar') );
+Assert::type('FooBar', $container->getByType('IFooBar'));
diff --git a/tests/DI/Compiler.extension.getConfig.phpt b/tests/DI/Compiler.extension.getConfig.phpt
@@ -37,4 +37,4 @@ bar:
 	lorem: ipsum
 ');
 
-Assert::same( ['lorem' => 'ipsum'], $foo->barConfig );
+Assert::same(['lorem' => 'ipsum'], $foo->barConfig);
diff --git a/tests/DI/Compiler.extension.phpt b/tests/DI/Compiler.extension.phpt
@@ -4,8 +4,8 @@
  * Test: Nette\DI\Compiler and user extension.
  */
 
-use Nette\DI,
-	Tester\Assert;
+use Nette\DI;
+use Tester\Assert;
 
 
 require __DIR__ . '/../bootstrap.php';
@@ -16,7 +16,7 @@ class DatabaseExtension extends Nette\DI\CompilerExtension
 
 	public function loadConfiguration()
 	{
-		Assert::same( ['foo' => 'hello'], $this->config );
+		Assert::same(['foo' => 'hello'], $this->config);
 		Notes::add(__METHOD__);
 	}
 
@@ -59,11 +59,11 @@ Assert::same([
 ], Notes::fetch());
 
 
-Assert::same( 'database.', $extension->prefix('') );
-Assert::same( 'database.member', $extension->prefix('member') );
-Assert::same( '@database.member', $extension->prefix('@member') );
+Assert::same('database.', $extension->prefix(''));
+Assert::same('database.member', $extension->prefix('member'));
+Assert::same('@database.member', $extension->prefix('@member'));
 
 
-Assert::same( ['foo' => 'hello'], $extension->getConfig() );
-Assert::same( ['foo' => 'hello'], $extension->getConfig(['foo' => 'bar']) );
-Assert::same( ['foo2' => 'hello', 'foo' => 'hello'], $extension->getConfig(['foo2' => '%bar%']) );
+Assert::same(['foo' => 'hello'], $extension->getConfig());
+Assert::same(['foo' => 'hello'], $extension->getConfig(['foo' => 'bar']));
+Assert::same(['foo2' => 'hello', 'foo' => 'hello'], $extension->getConfig(['foo2' => '%bar%']));