From ed2f9555076972e0339bc7a1e1cb2e936d9505de Mon Sep 17 00:00:00 2001
From: "U-XZ-PC\\XZ" <you@example.com>
Date: Tue, 13 Sep 2016 22:57:49 -0400
Subject: [PATCH 1/2] clean up

---
 data_types.php     | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 src/data_types.php | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 data_types.php
 create mode 100644 src/data_types.php

diff --git a/data_types.php b/data_types.php
new file mode 100644
index 0000000..744d677
--- /dev/null
+++ b/data_types.php
@@ -0,0 +1,68 @@
+<?php
+function convert_to_int($dataIn){
+	settype($dataIn, "integer");
+	return $dataIn;
+}
+
+function convert_to_float($dataIn){
+	settype($dataIn, "float");
+	return $dataIn;	
+}
+
+function convert_to_string($dataIn) {	
+	if(is_array($dataIn)){
+		$dataOut='';
+		foreach ($dataIn as $value){
+			$dataOut = $dataOut.$value.', ';			
+		}
+		if(count($dataIn) == 1){
+			$dataOut = $dataIn[0];
+			settype($dataOut,"string");}
+	}else{	
+		$dataOut = $dataIn;
+		settype($dataOut, "string");
+	}
+	return $dataOut;		
+}
+
+function convert_to_bool($dataIn){
+	settype($dataIn, "boolean");
+	return $dataIn;	
+}
+
+function convert_to_array($dataIn){
+	settype($dataIn, "array");
+	return $dataIn;		
+}
+
+function convert_to_null($dataIn){
+	if (!$dataIn){
+		settype($dataIn, "null");
+	}
+	return $dataIn;	
+}
+
+
+/*
+//input data
+$input = [1,23,45];
+echo "The input data is: ";
+var_dump($input);
+
+
+
+//output data
+echo "</br> After the input is converted, the output data is: ";
+//$output = convert_to_int($input);//convert to integer
+//$output = convert_to_float($input);//convert to float
+//$output = convert_to_string($input);//convert to string
+//$output = convert_to_bool($input);//convert to boolean
+//$output = convert_to_array($input);//convert to boolean
+$output = convert_to_null($input);//convert to null
+var_dump($output);
+
+
+//echo "</br>$output</br>";
+//var_dump ($input);
+*/
+?>
\ No newline at end of file
diff --git a/src/data_types.php b/src/data_types.php
new file mode 100644
index 0000000..744d677
--- /dev/null
+++ b/src/data_types.php
@@ -0,0 +1,68 @@
+<?php
+function convert_to_int($dataIn){
+	settype($dataIn, "integer");
+	return $dataIn;
+}
+
+function convert_to_float($dataIn){
+	settype($dataIn, "float");
+	return $dataIn;	
+}
+
+function convert_to_string($dataIn) {	
+	if(is_array($dataIn)){
+		$dataOut='';
+		foreach ($dataIn as $value){
+			$dataOut = $dataOut.$value.', ';			
+		}
+		if(count($dataIn) == 1){
+			$dataOut = $dataIn[0];
+			settype($dataOut,"string");}
+	}else{	
+		$dataOut = $dataIn;
+		settype($dataOut, "string");
+	}
+	return $dataOut;		
+}
+
+function convert_to_bool($dataIn){
+	settype($dataIn, "boolean");
+	return $dataIn;	
+}
+
+function convert_to_array($dataIn){
+	settype($dataIn, "array");
+	return $dataIn;		
+}
+
+function convert_to_null($dataIn){
+	if (!$dataIn){
+		settype($dataIn, "null");
+	}
+	return $dataIn;	
+}
+
+
+/*
+//input data
+$input = [1,23,45];
+echo "The input data is: ";
+var_dump($input);
+
+
+
+//output data
+echo "</br> After the input is converted, the output data is: ";
+//$output = convert_to_int($input);//convert to integer
+//$output = convert_to_float($input);//convert to float
+//$output = convert_to_string($input);//convert to string
+//$output = convert_to_bool($input);//convert to boolean
+//$output = convert_to_array($input);//convert to boolean
+$output = convert_to_null($input);//convert to null
+var_dump($output);
+
+
+//echo "</br>$output</br>";
+//var_dump ($input);
+*/
+?>
\ No newline at end of file

From 12ebd4645d2634158a5565fe00bf2ae05a79d5a3 Mon Sep 17 00:00:00 2001
From: "U-XZ-PC\\XZ" <you@example.com>
Date: Fri, 16 Sep 2016 15:12:50 -0400
Subject: [PATCH 2/2] fixed NULL problem

---
 data_types.php     | 68 ----------------------------------------------
 src/data_types.php | 26 ++++++++----------
 2 files changed, 11 insertions(+), 83 deletions(-)
 delete mode 100644 data_types.php

diff --git a/data_types.php b/data_types.php
deleted file mode 100644
index 744d677..0000000
--- a/data_types.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-function convert_to_int($dataIn){
-	settype($dataIn, "integer");
-	return $dataIn;
-}
-
-function convert_to_float($dataIn){
-	settype($dataIn, "float");
-	return $dataIn;	
-}
-
-function convert_to_string($dataIn) {	
-	if(is_array($dataIn)){
-		$dataOut='';
-		foreach ($dataIn as $value){
-			$dataOut = $dataOut.$value.', ';			
-		}
-		if(count($dataIn) == 1){
-			$dataOut = $dataIn[0];
-			settype($dataOut,"string");}
-	}else{	
-		$dataOut = $dataIn;
-		settype($dataOut, "string");
-	}
-	return $dataOut;		
-}
-
-function convert_to_bool($dataIn){
-	settype($dataIn, "boolean");
-	return $dataIn;	
-}
-
-function convert_to_array($dataIn){
-	settype($dataIn, "array");
-	return $dataIn;		
-}
-
-function convert_to_null($dataIn){
-	if (!$dataIn){
-		settype($dataIn, "null");
-	}
-	return $dataIn;	
-}
-
-
-/*
-//input data
-$input = [1,23,45];
-echo "The input data is: ";
-var_dump($input);
-
-
-
-//output data
-echo "</br> After the input is converted, the output data is: ";
-//$output = convert_to_int($input);//convert to integer
-//$output = convert_to_float($input);//convert to float
-//$output = convert_to_string($input);//convert to string
-//$output = convert_to_bool($input);//convert to boolean
-//$output = convert_to_array($input);//convert to boolean
-$output = convert_to_null($input);//convert to null
-var_dump($output);
-
-
-//echo "</br>$output</br>";
-//var_dump ($input);
-*/
-?>
\ No newline at end of file
diff --git a/src/data_types.php b/src/data_types.php
index 744d677..a5f9cb8 100644
--- a/src/data_types.php
+++ b/src/data_types.php
@@ -10,15 +10,10 @@ function convert_to_float($dataIn){
 }
 
 function convert_to_string($dataIn) {	
-	if(is_array($dataIn)){
-		$dataOut='';
-		foreach ($dataIn as $value){
-			$dataOut = $dataOut.$value.', ';			
-		}
-		if(count($dataIn) == 1){
-			$dataOut = $dataIn[0];
-			settype($dataOut,"string");}
-	}else{	
+	if(is_array($dataIn)){//if $dataIn is an array
+		$data = array_map("convert_to_string", $dataIn);//recursion, the function calling itself 
+		$dataOut = implode(', ', $data); //convert array to string	
+	}else{	//if $dataIn is not an array
 		$dataOut = $dataIn;
 		settype($dataOut, "string");
 	}
@@ -35,17 +30,18 @@ function convert_to_array($dataIn){
 	return $dataIn;		
 }
 
+
 function convert_to_null($dataIn){
-	if (!$dataIn){
-		settype($dataIn, "null");
+	if(!$dataIn || $dataIn === 'null'){
+		return null;
+	} else {
+		return $dataIn;
 	}
-	return $dataIn;	
 }
 
-
 /*
 //input data
-$input = [1,23,45];
+$input = ['null', null];
 echo "The input data is: ";
 var_dump($input);
 
@@ -57,7 +53,7 @@ function convert_to_null($dataIn){
 //$output = convert_to_float($input);//convert to float
 //$output = convert_to_string($input);//convert to string
 //$output = convert_to_bool($input);//convert to boolean
-//$output = convert_to_array($input);//convert to boolean
+//$output = convert_to_array($input);//convert to array
 $output = convert_to_null($input);//convert to null
 var_dump($output);