refactoring

Author: dg

src/ComponentModel/Component.php

@@ -56,19 +56,14 @@ final public function lookup(?string $type, bool $throw = true): ?IComponent
 				}
 			}
 
-			if ($obj) {
-				$this->monitors[$type] = [$obj, $depth, substr($path, 1), []];
-
-			} else {
-				$this->monitors[$type] = [null, null, null, []]; // not found
-			}
+			$this->monitors[$type] = $obj
+				? [$obj, $depth, substr($path, 1), []]
+				: [null, null, null, []]; // not found
 		}
 
 		if ($throw && $this->monitors[$type][0] === null) {
-			$message = $this->name !== null
-				? "Component '$this->name' is not attached to '$type'."
-				: "Component of type '" . static::class . "' is not attached to '$type'.";
-			throw new Nette\InvalidStateException($message);
+			$desc = $this->name === null ? "type of '" . static::class . "'" : "'$this->name'";
+			throw new Nette\InvalidStateException("Component $desc is not attached to '$type'.");
 		}
 
 		return $this->monitors[$type][0];
@@ -179,7 +174,7 @@ public function setParent(?IContainer $parent, ?string $name = null): static
 			throw new Nette\InvalidStateException("Component '$this->name' already has a parent.");
 		}
 
-		// remove from parent?
+		// remove from parent
 		if ($parent === null) {
 			$this->refreshMonitors(0);
 			$this->parent = null;

src/ComponentModel/Container.php

@@ -46,9 +46,8 @@ public function addComponent(IComponent $component, ?string $name, ?string $inse
 
 		if (!preg_match(self::NameRegexp, $name)) {
 			throw new Nette\InvalidArgumentException("Component name must be non-empty alphanumeric string, '$name' given.");
-		}
 
-		if (isset($this->components[$name])) {
+		} elseif (isset($this->components[$name])) {
 			throw new Nette\InvalidStateException("Component with name '$name' already exists.");
 		}
 
@@ -58,9 +57,7 @@ public function addComponent(IComponent $component, ?string $name, ?string $inse
 			if ($obj === $component) {
 				throw new Nette\InvalidStateException("Circular reference detected while adding component '$name'.");
 			}
-
-			$obj = $obj->getParent();
-		} while ($obj !== null);
+		} while (($obj = $obj->getParent()) !== null);
 
 		// user checking
 		$this->validateChildComponent($component);
@@ -117,11 +114,9 @@ final public function getComponent(string $name, bool $throw = true): ?IComponen
 
 		if (!isset($this->components[$name])) {
 			if (!preg_match(self::NameRegexp, $name)) {
-				if ($throw) {
-					throw new Nette\InvalidArgumentException("Component name must be non-empty alphanumeric string, '$name' given.");
-				}
-
-				return null;
+				return $throw
+					? throw new Nette\InvalidArgumentException("Component name must be non-empty alphanumeric string, '$name' given.")
+					: null;
 			}
 
 			$component = $this->createComponent($name);