Use get/set value attribute for value elements (#217)

Greg Bowler · web-flow · commit 1ffa6a1f747d · 2019-08-15T12:01:38.000+01:00
* Update fixes for CssXPath

* Use get/set attribute for value elements

* Missing parameter to setAttribute
diff --git a/composer.lock b/composer.lock
diff --git a/src/Element.php b/src/Element.php
@@ -124,7 +124,7 @@ public function prop_get_value() {
 		}
 
 		if(in_array(strtoupper($this->tagName), self::VALUE_ELEMENTS)) {
-			return $this->nodeValue;
+			return $this->getAttribute("value");
 		}
 
 		return null;
@@ -136,7 +136,7 @@ public function prop_set_value(string $newValue) {
 			return $this->$methodName($newValue);
 		}
 
-		$this->nodeValue = $newValue;
+		$this->setAttribute("value", $newValue);
 	}
 
 	public function prop_get_id():?string {
diff --git a/test/unit/ElementTest.php b/test/unit/ElementTest.php
@@ -499,4 +499,15 @@ public function testAttributeValueSelection() {
 		self::assertSame($input1, $input2);
 		self::assertEquals("Scarlett", $input1->value);
 	}
+
+	public function testOptionValueGetSet() {
+		$document = new HTMLDocument(Helper::HTML_SELECTS);
+		foreach($document->querySelectorAll("[name=from] option") as $fromOption) {
+			self::assertIsNumeric($fromOption->value);
+		}
+
+		foreach($document->querySelectorAll("[name=to] option") as $toOption) {
+			self::assertIsNumeric($toOption->value);
+		}
+	}
 }
diff --git a/test/unit/Helper/Helper.php b/test/unit/Helper/Helper.php
@@ -370,6 +370,35 @@ class Helper {
 		<input name="dob" type="date" />
 	</label>
 </form>
+HTML;
+
+	const HTML_SELECTS = <<<HTML
+<!doctype html>
+<form>
+	<label>
+		<span>From:</span>
+		<select name="from">
+			<option value="0">Zero</option>		
+			<option value="1">One</option>		
+			<option value="2">Two</option>		
+			<option value="3">Three</option>		
+			<option value="4">Four</option>		
+			<option value="5">Five</option>		
+		</select>
+	</label>
+	
+	<label>
+		<span>To:</span>
+		<select name="to">
+			<option value="5">Five</option>		
+			<option value="6">Six</option>		
+			<option value="7">Seven</option>		
+			<option value="8">Eight</option>		
+			<option value="9">Nine</option>		
+			<option value="10">Ten</option>
+		</select>
+	</label>
+</form>
 HTML;
 
 }

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public function prop_get_value() {`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if(in_array(strtoupper($this->tagName), self::VALUE_ELEMENTS)) {`
`127`		`- return $this->nodeValue;`
	`127`	`+ return $this->getAttribute("value");`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`return null;`
`@@ -136,7 +136,7 @@ public function prop_set_value(string $newValue) {`
`136`	`136`	`return $this->$methodName($newValue);`
`137`	`137`	`}`
`138`	`138`
`139`		`- $this->nodeValue = $newValue;`
	`139`	`+ $this->setAttribute("value", $newValue);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`public function prop_get_id():?string {`