coding style

Author: dg

src/Bridges/DITracy/ContainerPanel.php

@@ -34,7 +34,9 @@ class ContainerPanel implements Tracy\IBarPanel
 	public function __construct(Container $container)
 	{
 		$this->container = $container;
-		$this->elapsedTime = self::$compilationTime ? microtime(true) - self::$compilationTime : null;
+		$this->elapsedTime = self::$compilationTime
+			? microtime(true) - self::$compilationTime
+			: null;
 	}
 
 

src/DI/CompilerExtension.php

@@ -90,7 +90,9 @@ public function validateConfig(array $expected, array $config = null, string $na
 		if ($extra = array_diff_key((array) $config, $expected)) {
 			$name = $name ? str_replace('.', ' › ', $name) : $this->name;
 			$hint = Nette\Utils\Helpers::getSuggestion(array_keys($expected), key($extra));
-			$extra = $hint ? key($extra) : implode("', '{$name} › ", array_keys($extra));
+			$extra = $hint
+				? key($extra)
+				: implode("', '{$name} › ", array_keys($extra));
 			throw new Nette\DI\InvalidConfigurationException("Unknown configuration option '{$name} › {$extra}'" . ($hint ? ", did you mean '{$name} › {$hint}'?" : '.'));
 		}
 		return Nette\Schema\Helpers::merge($config, $expected);

src/DI/Config/Loader.php

@@ -120,7 +120,9 @@ private function getAdapter(string $file): Adapter
 		if (!isset($this->adapters[$extension])) {
 			throw new Nette\InvalidArgumentException("Unknown file extension '$file'.");
 		}
-		return is_object($this->adapters[$extension]) ? $this->adapters[$extension] : new $this->adapters[$extension];
+		return is_object($this->adapters[$extension])
+			? $this->adapters[$extension]
+			: new $this->adapters[$extension];
 	}
 
 

src/DI/Container.php

@@ -200,7 +200,9 @@ public function createService(string $name, array $args = [])
 
 		try {
 			$this->creating[$name] = true;
-			$service = $cb instanceof \Closure ? $cb(...$args) : $this->$method(...$args);
+			$service = $cb instanceof \Closure
+				? $cb(...$args)
+				: $this->$method(...$args);
 
 		} finally {
 			unset($this->creating[$name]);
@@ -235,7 +237,7 @@ public function getByType(string $type, bool $throw = true)
 				throw new MissingServiceException("Service of type '$type' not found. Check class name because it cannot be found.");
 			}
 			foreach ($this->methods as $method => $foo) {
-				$methodType = (new \ReflectionMethod(get_class($this), $method))->getReturnType()->getName();
+				$methodType = (new \ReflectionMethod(static::class, $method))->getReturnType()->getName();
 				if (is_a($methodType, $type, true)) {
 					throw new MissingServiceException("Service of type $type is not autowired or is missing in di › export › types.");
 				}

src/DI/Definitions/AccessorDefinition.php

@@ -34,7 +34,12 @@ public function setImplement(string $type)
 		$rc = new \ReflectionClass($type);
 
 		$method = $rc->getMethods()[0] ?? null;
-		if (!$method || $method->isStatic() || $method->getName() !== self::METHOD_GET || count($rc->getMethods()) > 1) {
+		if (
+			!$method
+			|| $method->isStatic()
+			|| $method->getName() !== self::METHOD_GET
+			|| count($rc->getMethods()) > 1
+		) {
 			throw new Nette\InvalidArgumentException("Service '{$this->getName()}': Interface $type must have just one non-static method get().");
 		} elseif ($method->getNumberOfParameters()) {
 			throw new Nette\InvalidArgumentException("Service '{$this->getName()}': Method $type::get() must have no parameters.");

src/DI/Definitions/Definition.php

@@ -119,7 +119,9 @@ final public function setAutowired($state = true)
 		if ($this->notifier && $this->autowired !== $state) {
 			($this->notifier)();
 		}
-		$this->autowired = is_string($state) || is_array($state) ? (array) $state : (bool) $state;
+		$this->autowired = is_string($state) || is_array($state)
+			? (array) $state
+			: (bool) $state;
 		return $this;
 	}
 

src/DI/Definitions/LocatorDefinition.php

@@ -43,7 +43,9 @@ public function setImplement(string $type)
 			)) {
 				throw new Nette\InvalidArgumentException(sprintf(
 					"Service '%s': Method %s::%s() does not meet the requirements: is create(\$name), get(\$name), create*() or get*() and is non-static.",
-					$this->getName(), $type, $method->name
+					$this->getName(),
+					$type,
+					$method->name
 				));
 			}
 		}

src/DI/Definitions/ServiceDefinition.php

@@ -10,7 +10,6 @@
 namespace Nette\DI\Definitions;
 
 use Nette;
-use Nette\DI\Definitions\Reference;
 use Nette\DI\ServiceCreationException;
 use Nette\PhpGenerator\Helpers as PhpHelpers;
 
@@ -64,7 +63,9 @@ public function setType(?string $type)
 	 */
 	public function setFactory($factory, array $args = [])
 	{
-		$this->factory = $factory instanceof Statement ? $factory : new Statement($factory, $args);
+		$this->factory = $factory instanceof Statement
+			? $factory
+			: new Statement($factory, $args);
 		return $this;
 	}
 
@@ -127,7 +128,9 @@ public function getSetup(): array
 	 */
 	public function addSetup($entity, array $args = [])
 	{
-		$this->setup[] = $entity instanceof Statement ? $entity : new Statement($entity, $args);
+		$this->setup[] = $entity instanceof Statement
+			? $entity
+			: new Statement($entity, $args);
 		return $this;
 	}
 
@@ -204,7 +207,10 @@ public function complete(Nette\DI\Resolver $resolver): void
 		$this->factory = $resolver->completeStatement($this->factory);
 
 		foreach ($this->setup as &$setup) {
-			if (is_string($setup->getEntity()) && strpbrk($setup->getEntity(), ':@?\\') === false) { // auto-prepend @self
+			if (
+				is_string($setup->getEntity())
+				&& strpbrk($setup->getEntity(), ':@?\\') === false
+			) { // auto-prepend @self
 				$setup = new Statement([new Reference(Reference::SELF), $setup->getEntity()], $setup->arguments);
 			}
 			$setup = $resolver->completeStatement($setup, true);
@@ -228,7 +234,8 @@ public function generateMethod(Nette\PhpGenerator\Method $method, Nette\DI\PhpGe
 			&& !(is_array($entity) && $entity[0] instanceof Reference && $entity[0]->getValue() === Nette\DI\ContainerBuilder::THIS_CONTAINER)
 			&& !(is_string($entity) && preg_match('#^[\w\\\\]+$#D', $entity) && is_subclass_of($entity, $type))
 		) {
-			$code .= PhpHelpers::formatArgs("if (!\$service instanceof $type) {\n"
+			$code .= PhpHelpers::formatArgs(
+				"if (!\$service instanceof $type) {\n"
 				. "\tthrow new Nette\\UnexpectedValueException(?);\n}\n",
 				["Unable to create service '{$this->getName()}', value returned by factory is not $type type."]
 			);

src/DI/DependencyChecker.php

@@ -80,8 +80,14 @@ public function export(): array
 	/**
 	 * Are dependencies expired?
 	 */
-	public static function isExpired(int $version, array $files, array &$phpFiles, array $classes, array $functions, string $hash): bool
-	{
+	public static function isExpired(
+		int $version,
+		array $files,
+		array &$phpFiles,
+		array $classes,
+		array $functions,
+		string $hash
+	): bool {
 		try {
 			$currentFiles = @array_map('filemtime', array_combine($tmp = array_keys($files), $tmp)); // @ - files may not exist
 			$origPhpFiles = $phpFiles;

src/DI/Extensions/DIExtension.php

@@ -38,18 +38,23 @@ public function __construct(bool $debugMode = false)
 		$this->config = new class {
 			/** @var ?bool */
 			public $debugger;
+
 			/** @var string[] */
 			public $excluded = [];
+
 			/** @var ?string */
 			public $parentClass;
+
 			/** @var object */
 			public $export;
 		};
 		$this->config->export = new class {
 			/** @var bool */
 			public $parameters = true;
+
 			/** @var string[]|bool|null */
 			public $tags = true;
+
 			/** @var string[]|bool|null */
 			public $types = true;
 		};