Control: isControlInvalid() checks children of classes not implementi…

…ng IRenderable [Closes nette/nette#93]

src/Application/UI/Control.php

@@ -184,12 +184,21 @@ public function isControlInvalid($snippet = NULL)
 				return TRUE;
 
 			} else {
-				foreach ($this->getComponents() as $component) {
-					if ($component instanceof IRenderable && $component->isControlInvalid()) {
-						// $this->invalidSnippets['__child'] = TRUE; // as cache
-						return TRUE;
+				$queue = array($this);
+				do {
+					foreach (array_shift($queue)->getComponents() as $component) {
+						if ($component instanceof IRenderable) {
+							if ($component->isControlInvalid()) {
+								// $this->invalidSnippets['__child'] = TRUE; // as cache
+								return TRUE;
+							}
+
+						} elseif ($component instanceof Nette\ComponentModel\IContainer) {
+							$queue[] = $component;
+						}
 					}
-				}
+				} while ($queue);
+
 				return FALSE;
 			}
 

tests/Application/Control.isControlInvalid.phpt

@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * Test: Nette\Application\UI\Control::isControlInvalid()
+ *
+ * @author     Jan Tvrdík
+ * @package    Nette\Application\UI
+ * @subpackage UnitTests
+ */
+
+use Nette\Application\UI;
+
+
+
+require __DIR__ . '/../bootstrap.php';
+
+
+
+class TestControl extends UI\Control
+{
+
+}
+
+
+
+$control = new TestControl();
+$child = new TestControl();
+$control->addComponent($child, 'foo');
+
+Assert::false($control->isControlInvalid());
+$child->invalidateControl();
+Assert::true($control->isControlInvalid());
+
+
+$control = new TestControl();
+$child = new Nette\ComponentModel\Container();
+$grandChild = new TestControl();
+$control->addComponent($child, 'foo');
+$child->addComponent($grandChild, 'bar');
+
+Assert::false($control->isControlInvalid());
+$grandChild->invalidateControl();
+Assert::true($control->isControlInvalid());