fix select value

Author: ext

src/fields/FormSelect.php

@@ -28,6 +28,9 @@ public function __construct($key, $id, $name, $value, $label=null, array $attr=[
 		}
 
 		parent::__construct($key, $id, $name, $value, null, $label, $attr);
+
+		/* FormInput sets value which select shouldn't have */
+		unset($this->attr['value']);
 	}
 
 	public function getOptions(){
@@ -40,6 +43,8 @@ public function getValue(){
 
 	public function getContent(array $extra_attr = array()){
 		$attr = array_merge_recursive($extra_attr, $this->attr);
-		return '<select ' . $this->serializeAttr($attr) . ">\n" . $this->options->serializeOptions($this->selected) . "\n</select>\n";
+		$sattr = $this->serializeAttr($attr, ['name', 'id']);
+		$soptions = $this->options->serializeOptions($this->selected);
+		return "<select {$sattr}>\n{$soptions}\n</select>";
 	}
 }

src/lib/FormOptions.php

@@ -53,7 +53,7 @@ public function getOptions(){
 	public function serializeOptions($selected){
 		return implode("\n", array_map(function($cur) use ($selected) {
 			$attr = ['value' => $cur->value];
-			if ( $cur->value === $selected ){
+			if ( $cur->value == $selected ){
 				$attr['selected'] = true;
 			}
 			$sattr = FormUtils::serializeAttr($attr);

tests/fields/FormSelectTest.php

@@ -1,9 +1,30 @@
 <?php
 
 use NitroXy\PHPForms\Form;
+use NitroXy\PHPForms\FormSelect;
 use NitroXy\PHPForms\FormOptions;
 
 class FormSelectTest extends PHPUnit_Framework_TestCase {
+	public function testSelectSimple(){
+		$field = new FormSelect('key', 'id', 'name', '7', 'label', []);
+		$this->assertEquals("<select name=\"name\" id=\"id\">\n\n</select>", $field->getContent());
+	}
+
+	public function testSelectValues(){
+		$field = new FormSelect('key', 'id', 'name', '7', 'label', ['options' => FormOptions::fromArray([1,2,3])]);
+		$this->assertEquals("<select name=\"name\" id=\"id\">\n<option value=\"0\">1</option>\n<option value=\"1\">2</option>\n<option value=\"2\">3</option>\n</select>", $field->getContent());
+	}
+
+	public function testSelectSelected(){
+		$field = new FormSelect('key', 'id', 'name', '1', 'label', ['options' => FormOptions::fromArray([1,2,3])]);
+		$this->assertEquals("<select name=\"name\" id=\"id\">\n<option value=\"0\">1</option>\n<option value=\"1\" selected>2</option>\n<option value=\"2\">3</option>\n</select>", $field->getContent());
+	}
+
+	public function testSelectExplicit(){
+		$field = new FormSelect('key', 'id', 'name', '7', 'label', ['options' => FormOptions::fromArray([1,2,3]), 'selected' => 2]);
+		$this->assertEquals("<select name=\"name\" id=\"id\">\n<option value=\"0\">1</option>\n<option value=\"1\">2</option>\n<option value=\"2\" selected>3</option>\n</select>", $field->getContent());
+	}
+
 	public function testNull(){
 		$mock = new MockLayout();
 		$form = Form::create('id', function($f){