From f3a3c0807201891a64cc28acca9d26b0f99ac708 Mon Sep 17 00:00:00 2001 From: Bernhard Schussek Date: Fri, 28 Mar 2014 18:26:06 +0100 Subject: [PATCH] [Form] Fixed infinite tests when ICU is available --- .../Extension/Core/Type/DateTimeTypeTest.php | 16 ++++++++-------- .../Tests/Extension/Core/Type/DateTypeTest.php | 12 ++++++------ .../Tests/Extension/Core/Type/TimeTypeTest.php | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php index b9c1ebad38fbe..c76039262d992 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php @@ -433,8 +433,8 @@ public function testDateTypeChoiceErrorsBubbleUp() $form['date']->addError($error); - $this->assertSame(array(), $form['date']->getErrors()); - $this->assertSame(array($error), $form->getErrors()); + $this->assertSame(array(), iterator_to_array($form['date']->getErrors())); + $this->assertSame(array($error), iterator_to_array($form->getErrors())); } public function testDateTypeSingleTextErrorsBubbleUp() @@ -446,8 +446,8 @@ public function testDateTypeSingleTextErrorsBubbleUp() $form['date']->addError($error); - $this->assertSame(array(), $form['date']->getErrors()); - $this->assertSame(array($error), $form->getErrors()); + $this->assertSame(array(), iterator_to_array($form['date']->getErrors())); + $this->assertSame(array($error), iterator_to_array($form->getErrors())); } public function testTimeTypeChoiceErrorsBubbleUp() @@ -457,8 +457,8 @@ public function testTimeTypeChoiceErrorsBubbleUp() $form['time']->addError($error); - $this->assertSame(array(), $form['time']->getErrors()); - $this->assertSame(array($error), $form->getErrors()); + $this->assertSame(array(), iterator_to_array($form['time']->getErrors())); + $this->assertSame(array($error), iterator_to_array($form->getErrors())); } public function testTimeTypeSingleTextErrorsBubbleUp() @@ -470,8 +470,8 @@ public function testTimeTypeSingleTextErrorsBubbleUp() $form['time']->addError($error); - $this->assertSame(array(), $form['time']->getErrors()); - $this->assertSame(array($error), $form->getErrors()); + $this->assertSame(array(), iterator_to_array($form['time']->getErrors())); + $this->assertSame(array($error), iterator_to_array($form->getErrors())); } } diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php index 508ab410b018f..e38bfe0ebb61c 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php @@ -745,8 +745,8 @@ public function testYearErrorsBubbleUp($widget) )); $form['year']->addError($error); - $this->assertSame(array(), $form['year']->getErrors()); - $this->assertSame(array($error), $form->getErrors()); + $this->assertSame(array(), iterator_to_array($form['year']->getErrors())); + $this->assertSame(array($error), iterator_to_array($form->getErrors())); } /** @@ -760,8 +760,8 @@ public function testMonthErrorsBubbleUp($widget) )); $form['month']->addError($error); - $this->assertSame(array(), $form['month']->getErrors()); - $this->assertSame(array($error), $form->getErrors()); + $this->assertSame(array(), iterator_to_array($form['month']->getErrors())); + $this->assertSame(array($error), iterator_to_array($form->getErrors())); } /** @@ -775,8 +775,8 @@ public function testDayErrorsBubbleUp($widget) )); $form['day']->addError($error); - $this->assertSame(array(), $form['day']->getErrors()); - $this->assertSame(array($error), $form->getErrors()); + $this->assertSame(array(), iterator_to_array($form['day']->getErrors())); + $this->assertSame(array($error), iterator_to_array($form->getErrors())); } public function testYearsFor32BitsMachines() diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php index 9bdfe1567b3ce..3dc5cff438c8f 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php @@ -601,8 +601,8 @@ public function testHourErrorsBubbleUp($widget) )); $form['hour']->addError($error); - $this->assertSame(array(), $form['hour']->getErrors()); - $this->assertSame(array($error), $form->getErrors()); + $this->assertSame(array(), iterator_to_array($form['hour']->getErrors())); + $this->assertSame(array($error), iterator_to_array($form->getErrors())); } /** @@ -616,8 +616,8 @@ public function testMinuteErrorsBubbleUp($widget) )); $form['minute']->addError($error); - $this->assertSame(array(), $form['minute']->getErrors()); - $this->assertSame(array($error), $form->getErrors()); + $this->assertSame(array(), iterator_to_array($form['minute']->getErrors())); + $this->assertSame(array($error), iterator_to_array($form->getErrors())); } /** @@ -632,8 +632,8 @@ public function testSecondErrorsBubbleUp($widget) )); $form['second']->addError($error); - $this->assertSame(array(), $form['second']->getErrors()); - $this->assertSame(array($error), $form->getErrors()); + $this->assertSame(array(), iterator_to_array($form['second']->getErrors())); + $this->assertSame(array($error), iterator_to_array($form->getErrors())); } /**