[INVALID] Tried to fix the tests

symfony · wouterj · Sep 22, 2013 · Dec 28, 2013 · Dec 28, 2013 · Dec 28, 2013
commit f002137b9b7a0bf21cb7f2f131d1f8f589800dc9
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_errors.html.php b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_errors.html.php
@@ -1,4 +1,4 @@
-<?php if ($errors): ?>
+<?php if (count($errors)): ?>
     <ul>
         <?php foreach ($errors as $error): ?>
             <li><?php echo $error->getMessage() ?></li>

diff --git a/src/Symfony/Component/Form/FormErrorBag.php b/src/Symfony/Component/Form/FormErrorBag.php
@@ -89,6 +89,14 @@ public function rewind()
 
     public function valid()
     {
+        while (current($this->errors) instanceof FormErrorBag) {
+            $this->next();
+
+            if (!$this->valid()) {
+                return false;
+            }
+        }
+
         return null !== key($this->errors);
     }
 

diff --git a/src/Symfony/Component/Form/Tests/FormErrorBagTest.php b/src/Symfony/Component/Form/Tests/FormErrorBagTest.php
@@ -51,6 +51,8 @@ public function testRecursivelyIterateErrors()
             $this->assertInstanceof('Symfony\Component\Form\FormError', $error);
             $this->assertEquals(next($messages), $error->getMessage());
         }
+
+        $this->assertFalse(next($messages), 'got all errors');
     }
 
     public function testCountingErrors()