Merge branch 'develop' into 4.0

formers · Apr 18, 2016 · 37f6876 · 37f6876
2 parents 78ae8c6 + 8fc2d5e
commit 37f6876
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/src/Former/Traits/Field.php b/src/Former/Traits/Field.php
@@ -303,7 +303,7 @@ public function value($value)
 		// Check if we already have a value stored for this field or in POST data
 		$already = $this->repopulate();
 
-		if ($already === null) {
+		if (!$already) {
 			$this->value = $value;
 		}
 

diff --git a/tests/Fields/HiddenTest.php b/tests/Fields/HiddenTest.php
@@ -15,7 +15,7 @@ public function testCanCreateHiddenField()
 		$this->assertHTML($field, $input);
 	}
 
-	public function testCanRepopulateHiddenFields()
+	public function testCanPopulateHiddenFields()
 	{
 		$this->former->populate(array('foo' => 'bar'));
 
@@ -26,19 +26,7 @@ public function testCanRepopulateHiddenFields()
 
 		$this->assertHTML($field, $input);
 	}
-
-	public function testCanRepopulateHiddenFieldsWithZero()
-	{
-		$this->former->populate(array('foo' => '0'));
-
-		$input                        = $this->former->hidden('foo')->value('bis')->__toString();
-		$matcher                      = $this->matchField(array(), 'hidden');
-		$field                        = array_except($matcher, 'id');
-		$field['attributes']['value'] = '0';
-
-		$this->assertHTML($field, $input);
-	}
-
+
 	public function testEncodedValue()
 	{
 		$input = $this->former->hidden('foo')->value('<a>bar</a>')->__toString();