added PhpNamespace::getClass() & getFunction()

Author: dg

src/PhpGenerator/PhpNamespace.php

@@ -313,6 +313,30 @@ public function addEnum(string $name): EnumType
 	}
 
 
+	/**
+	 * Returns a class-like type from the namespace.
+	 */
+	public function getClass(string $name): ClassType|InterfaceType|TraitType|EnumType
+	{
+		return $this->classes[strtolower($name)] ?? throw new Nette\InvalidArgumentException("Class '$name' not found.");
+	}
+
+
+	/**
+	 * Returns all class-like types in the namespace.
+	 * @return (ClassType|InterfaceType|TraitType|EnumType)[]
+	 */
+	public function getClasses(): array
+	{
+		$res = [];
+		foreach ($this->classes as $class) {
+			$res[$class->getName()] = $class;
+		}
+
+		return $res;
+	}
+
+
 	/**
 	 * Removes a class-like type from namespace.
 	 */
@@ -340,42 +364,36 @@ public function addFunction(string $name): GlobalFunction
 
 
 	/**
-	 * Removes a function type from namespace.
+	 * Returns a function from the namespace.
 	 */
-	public function removeFunction(string $name): static
+	public function getFunction(string $name): GlobalFunction
 	{
-		unset($this->functions[strtolower($name)]);
-		return $this;
+		return $this->functions[strtolower($name)] ?? throw new Nette\InvalidArgumentException("Function '$name' not found.");
 	}
 
 
 	/**
-	 * Returns all class-like types in the namespace.
-	 * @return (ClassType|InterfaceType|TraitType|EnumType)[]
+	 * Returns all functions in the namespace.
+	 * @return GlobalFunction[]
 	 */
-	public function getClasses(): array
+	public function getFunctions(): array
 	{
 		$res = [];
-		foreach ($this->classes as $class) {
-			$res[$class->getName()] = $class;
+		foreach ($this->functions as $fn) {
+			$res[$fn->getName()] = $fn;
 		}
 
 		return $res;
 	}
 
 
 	/**
-	 * Returns all functions in the namespace.
-	 * @return GlobalFunction[]
+	 * Removes a function type from namespace.
 	 */
-	public function getFunctions(): array
+	public function removeFunction(string $name): static
 	{
-		$res = [];
-		foreach ($this->functions as $fn) {
-			$res[$fn->getName()] = $fn;
-		}
-
-		return $res;
+		unset($this->functions[strtolower($name)]);
+		return $this;
 	}
 
 

tests/PhpGenerator/PhpNamespace.phpt

@@ -25,8 +25,10 @@ Assert::exception(
 $interfaceB = $namespace->addInterface('B');
 Assert::same($namespace, $interfaceB->getNamespace());
 
+Assert::same($classA, $namespace->getClass('a'));
+
 Assert::count(2, $namespace->getClasses());
-Assert::type(Nette\PhpGenerator\ClassType::class, $namespace->getClasses()['A']);
+Assert::same($classA, $namespace->getClasses()['A']);
 $namespace->removeClass('a');
 Assert::count(1, $namespace->getClasses());
 
@@ -39,6 +41,8 @@ Assert::exception(
 	"Cannot add 'Foo', because it already exists.",
 );
 
+Assert::same($function, $namespace->getFunction('foo'));
+
 Assert::count(1, $namespace->getFunctions());
 Assert::same($function, $namespace->getFunctions()['foo']);
 $namespace->removeFunction('FOO');