fix fields sometimes being the wrong datatype

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Sulphur changelog
 
+## v1.1.1
+
+* Fixed field values sometimes being the wrong datatype
+
 ## v1.1.0
 
 * Added `passes` and `doesNotPass` for filtering with custom callbacks

src/Response.php

@@ -15,7 +15,7 @@ public function __construct($response) {
 
 	/**
 	 * Parses the passed response and passes the key-value pairs to references.
-	 * @param type $response the response to parse
+	 * @param string $response the response to parse
 	 */
 	protected function parse($response) {
 
@@ -47,7 +47,8 @@ protected function parse($response) {
 			} else if(preg_match('/^(.*)=(.*)$/', $line, $matches)) {
 				// key-value pair, like "State=Lobby"
 				if(!$heading) {
-					$reference[trim($matches[1])] = $matches[2];
+					$value = self::cast($matches[2]);
+					$reference[trim($matches[1])] = $value;
 				}
 			}
 		}
@@ -81,4 +82,23 @@ public function all() {
 		return $this->where(null);
 	}
 
+	/**
+	 * Casts the value to the correct datatype.
+	 * @param string $value the value to cast
+	 * @return any
+	 */
+	public static function cast($value) {
+		$matches = array();
+		if(strtolower($value) === 'true') {
+			$value = (bool) true;
+		} else if(strtolower($value) === 'false') {
+			$value = (bool) false;
+		} else if(is_numeric($value)) {
+			$value = (int) $value;
+		} else if(preg_match('/^"(.*)"$/', $value, $matches)) {
+			$value = $matches[1];
+		}
+		return $value;
+	}
+
 }

tests/src/ResponseTest.php

@@ -17,18 +17,52 @@ protected function setUp() {
 		$this->response = $factory->fromString(file_get_contents(__DIR__.'/data/reference.ini'));
 	}
 
+	/**
+	 * @covers Sulphur\Response::parse
+	 * @depends testAll
+	 */
+	public function testParse() {
+		$references = $this->response->all();
+		$reference = $references[0];
+		$this->assertEquals(12, $reference->Icon);
+		$this->assertEquals('Minor Melee', $reference->Title);
+		$this->assertEquals(true, $reference->IsNetworkGame);
+	}
+
 	/**
 	 * @covers Sulphur\Response::where
 	 */
 	public function testWhere() {
-		$this->assertInstanceOf('Sulphur\FilterableList', $this->response->where('foo'));
+		$where = $this->response->where('foo');
+		$this->assertInstanceOf('Sulphur\FilterableList', $where);
+		$this->assertEquals(1, count($where));
 	}
 
 	/**
 	 * @covers Sulphur\Response::all
 	 */
 	public function testAll() {
-		$this->assertInstanceOf('Sulphur\FilterableList', $this->response->all());
+		$all = $this->response->all();
+		$this->assertInstanceOf('Sulphur\FilterableList', $all);
+		$this->assertEquals(1, count($all));
+	}
+
+	/**
+	 * @covers Sulphur\Response::all
+	 */
+	public function testCast() {
+		$this->assertSame(true, Response::cast('true'));
+		$this->assertSame(true, Response::cast('TRUE'));
+		$this->assertSame(false, Response::cast('false'));
+		$this->assertSame(false, Response::cast('FALSE'));
+		$this->assertSame('String', Response::cast('"String"'));
+		$this->assertSame('true', Response::cast('"true"'));
+		$this->assertSame('TRUE', Response::cast('"TRUE"'));
+		$this->assertSame('false', Response::cast('"false"'));
+		$this->assertSame('FALSE', Response::cast('"FALSE"'));
+		$this->assertSame('42', Response::cast('"42"'));
+		$this->assertSame(42, Response::cast('42'));
+		$this->assertNotSame(42, Response::cast('"42"'));
 	}
 
 }