Merge pull request #2 from QuorumCollection/donatj-patch-1

donatj · donatj · commit 35b117616014 · 2015-03-09T10:40:25.000-05:00
Update DataSheet.php to Allow Nulls
diff --git a/src/DataSheet.php b/src/DataSheet.php
@@ -53,10 +53,12 @@ public function addRows( $dataSet ) {
 	 * @param array $row
 	 */
 	public function addRow( array $row ) {
-		foreach( $row as $col ) {
-			if( !is_scalar($col) ) {
+		foreach( $row as &$col ) {
+			if( !is_scalar($col) && !is_null($col) ) {
 				throw new InvalidDataTypeException;
 			}
+
+			$col = (string)$col;
 		}
 
 		fwrite($this->tmpStream, json_encode($row) . "\n");

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,12 @@ public function addRows( $dataSet ) {`
`53`	`53`	`* @param array $row`
`54`	`54`	`*/`
`55`	`55`	`public function addRow( array $row ) {`
`56`		`- foreach( $row as $col ) {`
`57`		`- if( !is_scalar($col) ) {`
	`56`	`+ foreach( $row as &$col ) {`
	`57`	`+ if( !is_scalar($col) && !is_null($col) ) {`
`58`	`58`	`throw new InvalidDataTypeException;`
`59`	`59`	`}`
	`60`	`+`
	`61`	`+ $col = (string)$col;`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`fwrite($this->tmpStream, json_encode($row) . "\n");`