Container::getComponents() parameters are silently deprecated

nette · Feb 8, 2024 · 5ebd8d9 · 5ebd8d9
1 parent 7b1421a
commit 5ebd8d9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/ComponentModel/Container.php b/src/ComponentModel/Container.php
@@ -178,12 +178,13 @@ protected function createComponent(string $name): ?IComponent
 
 
 	/**
-	 * Iterates over descendants components.
+	 * Returns immediate child components.
 	 * @return iterable<int|string,IComponent>
 	 */
-	final public function getComponents(bool $deep = false, ?string $filterType = null): iterable
+	final public function getComponents(): iterable
 	{
-		if ($deep) {
+		$filterType = func_get_args()[1] ?? null;
+		if (func_get_args()[0] ?? null) { // back compatibility
 			$iterator = new RecursiveComponentIterator($this->components);
 			$iterator = new \RecursiveIteratorIterator($iterator, \RecursiveIteratorIterator::SELF_FIRST);
 			if ($filterType) {
@@ -192,9 +193,9 @@ final public function getComponents(bool $deep = false, ?string $filterType = nu
 			return $iterator;
 		}
 
-		return $filterType === null
-			? $this->components
-			: array_filter($this->components, fn($item) => $item instanceof $filterType);
+		return $filterType
+			? array_filter($this->components, fn($item) => $item instanceof $filterType)
+			: $this->components;
 	}
 
 

diff --git a/src/ComponentModel/IContainer.php b/src/ComponentModel/IContainer.php
@@ -35,8 +35,8 @@ function removeComponent(IComponent $component): void;
 	function getComponent(string $name): ?IComponent;
 
 	/**
-	 * Iterates over descendants components.
-	 * @return iterable<int|string,IComponent>
+	 * Returns immediate child components.
+	 * @return array<int|string,IComponent>
 	 */
 	function getComponents(): iterable;
 }