From bb4fc01be6a5308f23a9b583c183390d4d0d2828 Mon Sep 17 00:00:00 2001 From: micahpotts Date: Wed, 18 May 2016 10:50:21 -0400 Subject: [PATCH 01/11] Checking work for convert_to_int and convert_to_float Want to see if I'm getting 0.0 and it's just not showing. --- src/data_types.php | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/data_types.php diff --git a/src/data_types.php b/src/data_types.php new file mode 100644 index 0000000..bf55776 --- /dev/null +++ b/src/data_types.php @@ -0,0 +1,42 @@ + Date: Tue, 24 May 2016 18:20:19 -0400 Subject: [PATCH 02/11] Added empty functions for each Trying to avoid fatal error. Seeing if I can check each problem singly as I go. --- src/data_types.php | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index bf55776..ce6b451 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -3,10 +3,11 @@ // convert_to_int() function convert_to_int($int){ + return intval($int); } - echo convert_to_int('666'); + //echo convert_to_int('666'); //echo convert_to_int('dog'); @@ -22,21 +23,44 @@ function convert_to_float($float){ } - $float = convert_to_float('fuuuk'); + //$float = convert_to_float('fuuuk'); //$float = convert_to_float('3.14159PIETOWNANDZBOYS'); - var_dump($float); - echo $float; + //var_dump($float); + + //echo $float; //convert_to_string() - //function convert_to_string($num){ - // return strval($num); - //} + function convert_to_string($num){ + + if(strval($num) != FALSE){ + return strval($num); + } else { + return ""; + } + } + //$num = convert_to_string(FALSE); //$num = convert_to_string(8008); - + //echo gettype($num); - //echo $num; \ No newline at end of file + //echo $num; + + +//convert_to_bool + + function convert_to_bool() {} + + +//convert_to_array() + + function convert_to_array() {} + + +//convert_to_null() + + function convert_to_null() {} + From e2486eb054dcfabe0cdf5eecb79284a010712278 Mon Sep 17 00:00:00 2001 From: micahpotts Date: Wed, 25 May 2016 11:27:32 -0400 Subject: [PATCH 03/11] Up to convert_to_array - to check answers so far --- src/data_types.php | 54 +++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index ce6b451..c497d53 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -7,8 +7,9 @@ function convert_to_int($int){ return intval($int); } - //echo convert_to_int('666'); + $num = convert_to_int('666'); //echo convert_to_int('dog'); + var_dump($num); // convert_to_float() @@ -22,42 +23,61 @@ function convert_to_float($float){ } } - - //$float = convert_to_float('fuuuk'); + $float = convert_to_float('foo'); //$float = convert_to_float('3.14159PIETOWNANDZBOYS'); - //var_dump($float); - + var_dump($float); //echo $float; //convert_to_string() - function convert_to_string($num){ - - if(strval($num) != FALSE){ - return strval($num); + function convert_to_string($str){ + if(is_array($str)){ + return implode("," , $str); + } else if(settype($str, 'string')) { + return $str; } else { return ""; - } + } } - //$num = convert_to_string(FALSE); - //$num = convert_to_string(8008); - - //echo gettype($num); + $var = convert_to_string(55); + //$var = convert_to_string(array('foo', 'bar')); + + //echo $var; + var_dump($var); + - //echo $num; //convert_to_bool - function convert_to_bool() {} + function convert_to_bool($boo) { + return (bool) $boo; + } + + $bool = convert_to_bool(null); + var_dump($bool); //convert_to_array() - function convert_to_array() {} + function convert_to_array($arrgh) { + if (is_string($arrgh) || is_bool($arrgh) || is_float($arrgh)) { + return str_split($arrgh); + } elseif (is_int($arrgh)) { + return array_map('intval', str_split($arrgh)); + } elseif (str_split($arrgh)) { + return str_split($arrgh); + } else { + return []; + } + } + + + $yayarray = convert_to_array(null); + var_dump($yayarray); //convert_to_null() From daccce4e88a4967aa161c424e3afe0dd87426e6c Mon Sep 17 00:00:00 2001 From: micahpotts Date: Wed, 25 May 2016 11:34:07 -0400 Subject: [PATCH 04/11] Up to convert_to_null to check answers --- src/data_types.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/data_types.php b/src/data_types.php index c497d53..5386285 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -75,7 +75,6 @@ function convert_to_array($arrgh) { } } - $yayarray = convert_to_array(null); var_dump($yayarray); From 2fa0186e90f87e9c074c15abd8c4886298a5e72f Mon Sep 17 00:00:00 2001 From: micahpotts Date: Wed, 25 May 2016 11:58:26 -0400 Subject: [PATCH 05/11] Tried to correct convert_to_string Added a space after the comma to see if that was what was creating the error. Error read: DataTypesTest::testConvertToString with data set #6 (array(2, 3), '2, 3') Failed asserting that two strings are identical. --- src/data_types.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 5386285..5a35994 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -34,7 +34,7 @@ function convert_to_float($float){ function convert_to_string($str){ if(is_array($str)){ - return implode("," , $str); + return implode(", " , $str); } else if(settype($str, 'string')) { return $str; } else { @@ -42,8 +42,8 @@ function convert_to_string($str){ } } - $var = convert_to_string(55); - //$var = convert_to_string(array('foo', 'bar')); + //$var = convert_to_string(55); + $var = convert_to_string(array('foo', 'bar')); //echo $var; var_dump($var); @@ -64,7 +64,7 @@ function convert_to_bool($boo) { //convert_to_array() function convert_to_array($arrgh) { - if (is_string($arrgh) || is_bool($arrgh) || is_float($arrgh)) { + if (is_string($arrgh)) {//|| is_bool($arrgh) || is_float($arrgh)) { return str_split($arrgh); } elseif (is_int($arrgh)) { return array_map('intval', str_split($arrgh)); From e8050123f27a58229e9d7060f9f8f2fe9c4f2707 Mon Sep 17 00:00:00 2001 From: micahpotts Date: Wed, 25 May 2016 15:33:23 -0400 Subject: [PATCH 06/11] Convert_to_array Added part to pass through array if it already exists as an array.. Took our str_split for strings and floats and changed to array_map('strval', array($arrgh) --- src/data_types.php | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 5a35994..1117c4f 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -49,8 +49,6 @@ function convert_to_string($str){ var_dump($var); - - //convert_to_bool function convert_to_bool($boo) { @@ -64,18 +62,18 @@ function convert_to_bool($boo) { //convert_to_array() function convert_to_array($arrgh) { - if (is_string($arrgh)) {//|| is_bool($arrgh) || is_float($arrgh)) { - return str_split($arrgh); - } elseif (is_int($arrgh)) { - return array_map('intval', str_split($arrgh)); - } elseif (str_split($arrgh)) { - return str_split($arrgh); - } else { - return []; - } + if (is_array($arrgh)) { + return($arrgh); + } elseif (is_string($arrgh) || is_bool($arrgh) || is_float($arrgh)) { + return array_map('strval', array($arrgh)); + } elseif (is_int($arrgh)) { + return array_map('intval', str_split($arrgh)); + } else { + return []; + } } - $yayarray = convert_to_array(null); + $yayarray = convert_to_array(array(2, 3)); var_dump($yayarray); @@ -83,3 +81,5 @@ function convert_to_array($arrgh) { function convert_to_null() {} + + From f82a8210feb9be1b70d85ba8bbef4f342dbd6f94 Mon Sep 17 00:00:00 2001 From: micahpotts Date: Wed, 25 May 2016 16:47:26 -0400 Subject: [PATCH 07/11] More work in convert_to_array Simplified code - took out conditionals. Checking to see if the null value converts to an empty array --- src/data_types.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 1117c4f..5ec0e26 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -64,16 +64,14 @@ function convert_to_bool($boo) { function convert_to_array($arrgh) { if (is_array($arrgh)) { return($arrgh); - } elseif (is_string($arrgh) || is_bool($arrgh) || is_float($arrgh)) { - return array_map('strval', array($arrgh)); - } elseif (is_int($arrgh)) { - return array_map('intval', str_split($arrgh)); + } else if($arrgh = null) { + return array(); } else { - return []; - } + return array($arrgh); + } } - $yayarray = convert_to_array(array(2, 3)); + $yayarray = convert_to_array(null); var_dump($yayarray); From e0496afe7bac608c4bed90e43c8fa0c30565e917 Mon Sep 17 00:00:00 2001 From: micahpotts Date: Thu, 26 May 2016 16:24:52 -0400 Subject: [PATCH 08/11] More array work, first shot at null --- src/data_types.php | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 5ec0e26..50670ad 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -7,9 +7,9 @@ function convert_to_int($int){ return intval($int); } - $num = convert_to_int('666'); + //$num = convert_to_int('666'); //echo convert_to_int('dog'); - var_dump($num); + //var_dump($num); // convert_to_float() @@ -23,10 +23,10 @@ function convert_to_float($float){ } } - $float = convert_to_float('foo'); + //$float = convert_to_float('foo'); //$float = convert_to_float('3.14159PIETOWNANDZBOYS'); - var_dump($float); + //var_dump($float); //echo $float; @@ -43,10 +43,10 @@ function convert_to_string($str){ } //$var = convert_to_string(55); - $var = convert_to_string(array('foo', 'bar')); + //$var = convert_to_string(array('foo', 'bar')); //echo $var; - var_dump($var); + //var_dump($var); //convert_to_bool @@ -55,8 +55,8 @@ function convert_to_bool($boo) { return (bool) $boo; } - $bool = convert_to_bool(null); - var_dump($bool); + //$bool = convert_to_bool(null); + //var_dump($bool); //convert_to_array() @@ -64,20 +64,23 @@ function convert_to_bool($boo) { function convert_to_array($arrgh) { if (is_array($arrgh)) { return($arrgh); - } else if($arrgh = null) { + } else if($arrgh != null) { return array(); } else { - return array($arrgh); + return array(); } } - $yayarray = convert_to_array(null); - var_dump($yayarray); + //$yayarray = convert_to_array(null); + //var_dump($yayarray); //convert_to_null() - function convert_to_null() {} - + function convert_to_null($foo) { + unset($foo); + } + //$bar = convert_to_null(FALSE); + //var_dump($bar); From 7d7e0e7152b6af3dd6b494b2b0832eda195d2d04 Mon Sep 17 00:00:00 2001 From: micahpotts Date: Tue, 31 May 2016 18:28:48 -0400 Subject: [PATCH 09/11] Possibly finished Checking for errors. --- src/data_types.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 50670ad..3457913 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -78,9 +78,12 @@ function convert_to_array($arrgh) { //convert_to_null() function convert_to_null($foo) { - unset($foo); + if ((!$foo) || $foo === 'null') { + return null; + } else { + return $foo; + } } - //$bar = convert_to_null(FALSE); - //var_dump($bar); - + $bar = convert_to_null("string"); + var_dump($bar); From 1d6aaff6c416df63ccf75ce19dcc878944bfae9e Mon Sep 17 00:00:00 2001 From: micahpotts Date: Tue, 31 May 2016 18:43:57 -0400 Subject: [PATCH 10/11] Work on array Went back to previous version of convert_to_array --- src/data_types.php | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 3457913..f1af83f 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -61,18 +61,30 @@ function convert_to_bool($boo) { //convert_to_array() +// function convert_to_array($arrgh) { +// if (is_array($arrgh)) { +// return($arrgh); +// } else if($arrgh != null) { +// return array(); +// } else { +// return array(); +// } +// } + function convert_to_array($arrgh) { if (is_array($arrgh)) { - return($arrgh); - } else if($arrgh != null) { - return array(); - } else { - return array(); - } - } + return($arrgh); + } elseif (is_string($arrgh) || is_bool($arrgh) || is_float($arrgh)) { + return array_map('strval', array($arrgh)); + } elseif (is_int($arrgh)) { + return array_map('intval', str_split($arrgh)); + } else { + return []; + } + } - //$yayarray = convert_to_array(null); - //var_dump($yayarray); + $yayarray = convert_to_array(null); + var_dump($yayarray); //convert_to_null() From f2970c5628070ec6d8a61164a0876ef7254bee60 Mon Sep 17 00:00:00 2001 From: micahpotts Date: Tue, 31 May 2016 19:00:57 -0400 Subject: [PATCH 11/11] More, more array work. --- src/data_types.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index f1af83f..3af4641 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -73,17 +73,17 @@ function convert_to_bool($boo) { function convert_to_array($arrgh) { if (is_array($arrgh)) { - return($arrgh); - } elseif (is_string($arrgh) || is_bool($arrgh) || is_float($arrgh)) { - return array_map('strval', array($arrgh)); - } elseif (is_int($arrgh)) { - return array_map('intval', str_split($arrgh)); + return $arrgh; + } elseif (is_string($arrgh) || is_bool($arrgh) || is_float($arrgh) || is_int($arrgh)) { + return array($arrgh); + // } elseif (is_int($arrgh)) { + // return array_map('intval', str_split($arrgh)); } else { return []; } } - $yayarray = convert_to_array(null); + $yayarray = convert_to_array("value"); var_dump($yayarray);