From 20c72a8f1f4065418bb120983306e3b05d4cca1a Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 18 May 2016 10:50:28 -0400 Subject: [PATCH 01/35] Code challenge part 1 Finished up to convert_to_float. --- src/data_types.php | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 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..73e89b6 --- /dev/null +++ b/src/data_types.php @@ -0,0 +1,63 @@ + From e6ec86cfee39d3109f76d5ca6ee36c023e34665e Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 18 May 2016 13:45:01 -0400 Subject: [PATCH 02/35] Code Challenge2 finished convert_to_string --- src/data_types.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 73e89b6..774188d 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -27,17 +27,21 @@ function convert_to_float($float){ return number_format($convert, 1); } } -echo convert_to_float(4.565); +echo convert_to_float("poop"); //convert_to_string function convert_to_string($string){ - if(){ - + if(is_integer($string) || is_string($string)){ + return strval($string); + } elseif (is_array($string)) { + return implode(",", $string); + } else { + return ''; } } -//echo convert_to_string("3452") +echo convert_to_string(null); //convert_to_bool From b8ded87568cd23961a919aa2db27563e8c6f4aeb Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 18 May 2016 15:46:07 -0400 Subject: [PATCH 03/35] Code Challenge 3 fixed float issue --- src/data_types.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 774188d..401f6df 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -6,28 +6,28 @@ function convert_to_int($int){ echo convert_to_int('4.567'); -/*convert_to_float -function convert_to_float($float){ +//convert_to_float +/*function convert_to_float($float){ $convert = floatval($float); - if($convert != 0) { + if($convert != null) { return $convert; } else { //return 0.0; return number_format($convert, 1); } } -echo convert_to_float(4.565);*/ +echo convert_to_float("dog");*/ //convert_to_float function convert_to_float($float){ $convert = floatval($float); - if(is_float($convert) == true) { + if($convert == true) { return $convert; } else { - return number_format($convert, 1); + return 0.0; } } -echo convert_to_float("poop"); +echo convert_to_float("25.656 "); //convert_to_string @@ -40,8 +40,7 @@ function convert_to_string($string){ return ''; } } - -echo convert_to_string(null); +echo convert_to_string('poop'); //convert_to_bool From d498a701ea099c68cca8cd52d5f08a04e2d24e40 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Sun, 22 May 2016 17:12:36 -0400 Subject: [PATCH 04/35] Attempt Arrays Most recent attempt at the arrays section. --- src/data_types.php | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 401f6df..c3bff4b 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -3,7 +3,7 @@ function convert_to_int($int){ return intval($int); } -echo convert_to_int('4.567'); +echo convert_to_int('dog'); //convert_to_float @@ -21,13 +21,13 @@ function convert_to_int($int){ //convert_to_float function convert_to_float($float){ $convert = floatval($float); - if($convert == true) { + if($convert) { return $convert; } else { - return 0.0; + return number_format($convert, 1); } } -echo convert_to_float("25.656 "); +echo convert_to_float("pop"); //convert_to_string @@ -35,30 +35,44 @@ function convert_to_string($string){ if(is_integer($string) || is_string($string)){ return strval($string); } elseif (is_array($string)) { - return implode(",", $string); + return implode(", ", $string); } else { return ''; } } -echo convert_to_string('poop'); +echo convert_to_string(['cat', 3, 'dog', 33, 'pop']); //convert_to_bool -//function convert_to_bool(){ - -//} +function convert_to_bool($bool){ + if(boolval($bool) == 1) { + return "true"; + } else { + return "false"; + } +} +echo convert_to_bool(45); //convert_to_array -//function convert_to_array(){ - -//} +// function convert_to_array($arr){ +// if($arr){ +// $convert_arr = array($arr); +// print_r($convert_arr); +// var_dump($convert_arr) +// } elseif(is_array($arr)){ +// print_r(array_values($arr)); +// } else { +// return "[ ]"; +// } +// } +// echo convert_to_array([1,3,4,2,1]); //convert_to_null -//function convert_to_null(){ - -//} +function convert_to_null(){ +} +echo convert_to_null(); From 5d1c81c0f9c14cecc7bc9d66a6bc82e5aa8de1f3 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Mon, 23 May 2016 08:46:31 -0400 Subject: [PATCH 05/35] code challenge 5 Attempted to fix array function --- src/data_types.php | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index c3bff4b..a5e75de 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -67,14 +67,27 @@ function convert_to_bool($bool){ // } // echo convert_to_array([1,3,4,2,1]); -//convert_to_null -function convert_to_null(){ - +//convert_to_array +function convert_to_array($arr){ + if(is_array($arr)) { + print_r($arr); + } + elseif (is_int($arr) OR is_string($arr)) { + $convert_arr = array($arr); + print_r($convert_arr); + } else { + return "[]"; + } } -echo convert_to_null(); - +echo convert_to_array(45); +//convert_to_null +// function convert_to_null(){ +// +// } +// +// echo convert_to_null(); ?> From 6ea60aa1b60c4daf3b9953dcc45381e9eba222f3 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Mon, 23 May 2016 08:59:00 -0400 Subject: [PATCH 06/35] code challenge 6 Added NULL function. --- src/data_types.php | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index a5e75de..5e40d9f 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -18,6 +18,7 @@ function convert_to_int($int){ } echo convert_to_float("dog");*/ + //convert_to_float function convert_to_float($float){ $convert = floatval($float); @@ -53,19 +54,6 @@ function convert_to_bool($bool){ } echo convert_to_bool(45); -//convert_to_array -// function convert_to_array($arr){ -// if($arr){ -// $convert_arr = array($arr); -// print_r($convert_arr); -// var_dump($convert_arr) -// } elseif(is_array($arr)){ -// print_r(array_values($arr)); -// } else { -// return "[ ]"; -// } -// } -// echo convert_to_array([1,3,4,2,1]); //convert_to_array function convert_to_array($arr){ @@ -82,12 +70,14 @@ function convert_to_array($arr){ echo convert_to_array(45); -//convert_to_null -// function convert_to_null(){ -// -// } -// -// echo convert_to_null(); +//convert_to_null +function convert_to_null($null){ + if (is_null($null) || $null != true) { + return "null"; + } else { + return $null; + } +} - ?> +echo convert_to_null(false); From eee5287ee29d031c06d2959f0532f9ddfb98b8ce Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Mon, 23 May 2016 09:09:34 -0400 Subject: [PATCH 07/35] Travis Attempt #2 made some changes to code. --- src/data_types.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 5e40d9f..7ff85f0 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -25,7 +25,7 @@ function convert_to_float($float){ if($convert) { return $convert; } else { - return number_format($convert, 1); + return 0.0; } } echo convert_to_float("pop"); @@ -38,7 +38,8 @@ function convert_to_string($string){ } elseif (is_array($string)) { return implode(", ", $string); } else { - return ''; + $empty = ''; + return $empty; } } echo convert_to_string(['cat', 3, 'dog', 33, 'pop']); @@ -47,9 +48,9 @@ function convert_to_string($string){ //convert_to_bool function convert_to_bool($bool){ if(boolval($bool) == 1) { - return "true"; + return true; } else { - return "false"; + return false; } } echo convert_to_bool(45); @@ -64,7 +65,8 @@ function convert_to_array($arr){ $convert_arr = array($arr); print_r($convert_arr); } else { - return "[]"; + $empty = [] + return $empty; } } @@ -74,7 +76,7 @@ function convert_to_array($arr){ //convert_to_null function convert_to_null($null){ if (is_null($null) || $null != true) { - return "null"; + return null; } else { return $null; } From c80cf9c0c4862a22f7a0ef2d07fe49b91fc65f11 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Mon, 23 May 2016 09:14:30 -0400 Subject: [PATCH 08/35] Travis Attempt #3 FIxed missing ";" line 69 --- src/data_types.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data_types.php b/src/data_types.php index 7ff85f0..a08825c 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -65,7 +65,7 @@ function convert_to_array($arr){ $convert_arr = array($arr); print_r($convert_arr); } else { - $empty = [] + $empty = []; return $empty; } } From f9e1b8e05636446121fd0dd45b8f3868a5526d8f Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Tue, 24 May 2016 18:12:38 -0400 Subject: [PATCH 09/35] test test --- src/data_types.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data_types.php b/src/data_types.php index a08825c..fb1cd9b 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -70,7 +70,7 @@ function convert_to_array($arr){ } } -echo convert_to_array(45); +echo convert_to_array(40); //convert_to_null From b946b2c81809a541c91a69e9a117efd0ea6b5737 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Tue, 24 May 2016 18:33:19 -0400 Subject: [PATCH 10/35] Travis Attempt #4 change to int_convert() --- src/data_types.php | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index fb1cd9b..f1e06fd 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -1,22 +1,15 @@ Date: Tue, 24 May 2016 18:50:54 -0400 Subject: [PATCH 11/35] Travis Attempt #5 modified convert_to_string. --- src/data_types.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index f1e06fd..9889427 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -2,7 +2,6 @@ //convert_to_int function convert_to_int($int){ $value = intval($int); - var_dump($value); if ($value) { return $value; } else { @@ -35,7 +34,7 @@ function convert_to_string($string){ return $empty; } } -echo convert_to_string(['cat', 3, 'dog', 33, 'pop']); +echo convert_to_string([3,5,3]); //convert_to_bool From 191f84c7152faa4fb886a44e3fcc72a6df983134 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Tue, 24 May 2016 19:43:57 -0400 Subject: [PATCH 12/35] Travis Attempt #6 updated convert_to_null --- src/data_types.php | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 9889427..a92b434 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -25,7 +25,7 @@ function convert_to_float($float){ //convert_to_string function convert_to_string($string){ - if(is_integer($string) || is_string($string)){ + if(is_integer($string) || is_string($string) || is_float($string)){ return strval($string); } elseif (is_array($string)) { return implode(", ", $string); @@ -34,7 +34,7 @@ function convert_to_string($string){ return $empty; } } -echo convert_to_string([3,5,3]); +echo convert_to_string(["skate",45,"trap"]); //convert_to_bool @@ -51,27 +51,32 @@ function convert_to_bool($bool){ //convert_to_array function convert_to_array($arr){ if(is_array($arr)) { - print_r($arr); + $test = array_values($arr); + var_dump($test); } - elseif (is_int($arr) OR is_string($arr)) { + elseif (is_int($arr) == 0 || is_string($arr)) { $convert_arr = array($arr); - print_r($convert_arr); + $value = array_values($convert_arr); + var_dump($value); } else { $empty = []; return $empty; } } -echo convert_to_array(40); +echo convert_to_array(0); //convert_to_null function convert_to_null($null){ - if (is_null($null) || $null != true) { - return null; + $value= is_null($null); + if ($value) { + return "nothing"; + } elseif ($null == 0 || $null == "0" || $null == "null") { + return "Yay!"; } else { return $null; } -} + } -echo convert_to_null(false); +echo convert_to_null("null"); From 20c19a6a9fedbd0b93945405fa4b72351f8e5566 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Tue, 24 May 2016 19:47:05 -0400 Subject: [PATCH 13/35] Travis Attempt #6a fixed the NULL debacle. --- src/data_types.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index a92b434..7784676 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -71,9 +71,9 @@ function convert_to_array($arr){ function convert_to_null($null){ $value= is_null($null); if ($value) { - return "nothing"; + return null; } elseif ($null == 0 || $null == "0" || $null == "null") { - return "Yay!"; + return null; } else { return $null; } From c0b1686e3f40d0710b4921f5ec5162ab8acc5fcd Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 25 May 2016 14:21:31 -0400 Subject: [PATCH 14/35] Travis Attempt #6b made small change to string convert --- src/data_types.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 7784676..78c5aee 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -48,7 +48,7 @@ function convert_to_bool($bool){ echo convert_to_bool(45); -//convert_to_array +convert_to_array function convert_to_array($arr){ if(is_array($arr)) { $test = array_values($arr); @@ -70,13 +70,15 @@ function convert_to_array($arr){ //convert_to_null function convert_to_null($null){ $value= is_null($null); + var_dump($value); if ($value) { - return null; + return "nothing"; } elseif ($null == 0 || $null == "0" || $null == "null") { - return null; + return "yay"; } else { return $null; + var_dump($null); } } -echo convert_to_null("null"); +echo convert_to_null(true); From 3945773cf2027afb8124addc9a1d5116d6aebae5 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 25 May 2016 14:37:52 -0400 Subject: [PATCH 15/35] Travis Attempt #7 Changed sometihings about the array --- src/data_types.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 78c5aee..d030d22 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -48,29 +48,28 @@ function convert_to_bool($bool){ echo convert_to_bool(45); -convert_to_array +//convert_to_array function convert_to_array($arr){ if(is_array($arr)) { $test = array_values($arr); var_dump($test); } - elseif (is_int($arr) == 0 || is_string($arr)) { + elseif (is_int($arr) || is_string($arr)) { $convert_arr = array($arr); - $value = array_values($convert_arr); - var_dump($value); - } else { + array_values($convert_arr); + } else { $empty = []; return $empty; } } -echo convert_to_array(0); +echo convert_to_array(45); //convert_to_null function convert_to_null($null){ $value= is_null($null); - var_dump($value); + if ($value) { return "nothing"; } elseif ($null == 0 || $null == "0" || $null == "null") { From 9780df8dd9a985dab3d3c33d97f4c8fe0ad6072b Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 25 May 2016 14:44:30 -0400 Subject: [PATCH 16/35] Travis Attempt #8 Made changes to NULL output. --- 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 d030d22..6fc599b 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -58,7 +58,7 @@ function convert_to_array($arr){ $convert_arr = array($arr); array_values($convert_arr); } else { - $empty = []; + $empty = ["Poop"]; return $empty; } } @@ -69,11 +69,11 @@ function convert_to_array($arr){ //convert_to_null function convert_to_null($null){ $value= is_null($null); - + if ($value) { - return "nothing"; + return null; } elseif ($null == 0 || $null == "0" || $null == "null") { - return "yay"; + return null; } else { return $null; var_dump($null); From 48d6665fa0442e0c425df1ac619b0b2f83006959 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 25 May 2016 15:44:54 -0400 Subject: [PATCH 17/35] Travis Attempt #9 Updated cinvert to NULL --- src/data_types.php | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 6fc599b..7bb72d4 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -48,35 +48,35 @@ function convert_to_bool($bool){ echo convert_to_bool(45); -//convert_to_array -function convert_to_array($arr){ - if(is_array($arr)) { - $test = array_values($arr); - var_dump($test); - } - elseif (is_int($arr) || is_string($arr)) { - $convert_arr = array($arr); - array_values($convert_arr); - } else { - $empty = ["Poop"]; - return $empty; - } -} - -echo convert_to_array(45); +// //convert_to_array +// function convert_to_array($arr){ +// if(is_array($arr)) { +// $test = array_values($arr); +// var_dump($test); +// } +// elseif (is_int($arr) || is_string($arr)) { +// $convert_arr = array($arr); +// return array_values($convert_arr); +// } else { +// $empty = ["empty"]; +// return $empty; +// } +// } +// +// echo convert_to_array("45"); //convert_to_null function convert_to_null($null){ $value= is_null($null); - + // var_dump($value); if ($value) { return null; - } elseif ($null == 0 || $null == "0" || $null == "null") { + } elseif ($null == 0 || $null == "0" || $null == "null" || is_bool($null)) { return null; } else { return $null; - var_dump($null); + // var_dump($null); } } From 15b7cd3f34a7084ab893dfeddec6e60c61631ab4 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 25 May 2016 15:50:44 -0400 Subject: [PATCH 18/35] Travis Attempt #9a uncommented out array cause i'm dumb and left it out. --- src/data_types.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 7bb72d4..b1307db 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -48,22 +48,22 @@ function convert_to_bool($bool){ echo convert_to_bool(45); -// //convert_to_array -// function convert_to_array($arr){ -// if(is_array($arr)) { -// $test = array_values($arr); -// var_dump($test); -// } -// elseif (is_int($arr) || is_string($arr)) { -// $convert_arr = array($arr); -// return array_values($convert_arr); -// } else { -// $empty = ["empty"]; -// return $empty; -// } -// } -// -// echo convert_to_array("45"); +//convert_to_array +function convert_to_array($arr){ + if(is_array($arr)) { + $test = array_values($arr); + var_dump($test); + } + elseif (is_int($arr) || is_string($arr)) { + $convert_arr = array($arr); + return array_values($convert_arr); + } else { + $empty = ["empty"]; + return $empty; + } +} + +echo convert_to_array("45"); //convert_to_null From 3435b92c4f07bcd044c4dc6c1cba1fb755e643ba Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 25 May 2016 16:11:37 -0400 Subject: [PATCH 19/35] Travis Attempt #10 fixing convert to null --- 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 b1307db..75a1d00 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -70,12 +70,12 @@ function convert_to_array($arr){ function convert_to_null($null){ $value= is_null($null); // var_dump($value); - if ($value) { - return null; - } elseif ($null == 0 || $null == "0" || $null == "null" || is_bool($null)) { + if (!$value) { + return $null; + } elseif ($null==0||$null=="0"||$null=="null"||is_bool($null)||$null==[]||$null="") { return null; } else { - return $null; + return null; // var_dump($null); } } From e8b00ed35dc245d5b0bb27a4f0fc8b6d0cb4617d Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 25 May 2016 19:48:28 -0400 Subject: [PATCH 20/35] Travis Attempt #11 Updated convert to array --- src/data_types.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 75a1d00..fa824fb 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -52,30 +52,30 @@ function convert_to_bool($bool){ function convert_to_array($arr){ if(is_array($arr)) { $test = array_values($arr); - var_dump($test); + print_r($test); } elseif (is_int($arr) || is_string($arr)) { $convert_arr = array($arr); - return array_values($convert_arr); + print_r(array_values($convert_arr)); } else { - $empty = ["empty"]; - return $empty; + $empty = []; + print_r($empty); } } -echo convert_to_array("45"); +echo convert_to_array([1,1,"poop"]); //convert_to_null function convert_to_null($null){ $value= is_null($null); // var_dump($value); - if (!$value) { - return $null; - } elseif ($null==0||$null=="0"||$null=="null"||is_bool($null)||$null==[]||$null="") { + if ($value) { return null; - } else { + } elseif ($null == 0 || $null == "0" || $null == "null" || is_bool($null) || $null == "" || $null == []) { return null; + } else { + return $null; // var_dump($null); } } From a684d7656641fe367911edf4a26dc2eae25da262 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 25 May 2016 20:10:40 -0400 Subject: [PATCH 21/35] travis Attempt #12 changed some of the null and the arrray --- src/data_types.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index fa824fb..91a6ddf 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -54,7 +54,7 @@ function convert_to_array($arr){ $test = array_values($arr); print_r($test); } - elseif (is_int($arr) || is_string($arr)) { + elseif (is_int($arr) || is_string($arr) || is_float($arr) || $arr != null || $arr != false) { $convert_arr = array($arr); print_r(array_values($convert_arr)); } else { @@ -63,7 +63,7 @@ function convert_to_array($arr){ } } -echo convert_to_array([1,1,"poop"]); +echo convert_to_array(false); //convert_to_null @@ -72,12 +72,13 @@ function convert_to_null($null){ // var_dump($value); if ($value) { return null; - } elseif ($null == 0 || $null == "0" || $null == "null" || is_bool($null) || $null == "" || $null == []) { - return null; - } else { + } /*elseif ($null == 0 || $null == "0" || $null == "null" || is_bool($null) || $null == "" || $null == []) { + return "yay"; + }*/ else { return $null; - // var_dump($null); + //var_dump($null); } } -echo convert_to_null(true); +/*$poo =*/ convert_to_null("true"); +// var_dump($poo); From 13d08d4bebdf95981720dc87d0190e46376777c9 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Wed, 25 May 2016 21:00:37 -0400 Subject: [PATCH 22/35] Travis Attempt #13 Made changes to array and null --- src/data_types.php | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 91a6ddf..d2102d4 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -45,7 +45,7 @@ function convert_to_bool($bool){ return false; } } -echo convert_to_bool(45); +echo convert_to_bool(798); //convert_to_array @@ -54,31 +54,35 @@ function convert_to_array($arr){ $test = array_values($arr); print_r($test); } - elseif (is_int($arr) || is_string($arr) || is_float($arr) || $arr != null || $arr != false) { + elseif (is_int($arr) || is_string($arr) || is_float($arr) || is_bool($arr)) { $convert_arr = array($arr); print_r(array_values($convert_arr)); - } else { - $empty = []; - print_r($empty); + } else { + if (!$arr == null) { + $empty = []; + print_r($empty); + } else + print_r(null); + var_dump($empty); } } -echo convert_to_array(false); +echo convert_to_array(45); //convert_to_null function convert_to_null($null){ $value= is_null($null); + $value2 = is_bool($null); // var_dump($value); - if ($value) { - return null; - } /*elseif ($null == 0 || $null == "0" || $null == "null" || is_bool($null) || $null == "" || $null == []) { - return "yay"; - }*/ else { + if ($null) { return $null; - //var_dump($null); - } + } elseif ($value || $null == 0 || $null == "0" || $null == 0.0 || $null == "null" || is_bool($null)) { + return null; + } else { + return $value2; + var_dump($value2); + } } -/*$poo =*/ convert_to_null("true"); -// var_dump($poo); +echo convert_to_null(true); From 9c7475247e751b6d1fee1e8b6e7c86a6ec5527a1 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Thu, 26 May 2016 17:40:56 -0400 Subject: [PATCH 23/35] Travis Attempt #14 revamped convert to NULL --- src/data_types.php | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index d2102d4..98c8fe3 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -71,18 +71,31 @@ function convert_to_array($arr){ //convert_to_null -function convert_to_null($null){ - $value= is_null($null); - $value2 = is_bool($null); - // var_dump($value); +// function convert_to_null($null){ +// $value= is_null($null); +// // $value2 = is_bool($null); +// var_dump($value); +// if ($value == false) { +// return "begining value"; +// } elseif ($null == 0 || $null == "0" || $null == 0.0 || $null == "null" || is_bool($null)) { +// return "nothing"; +// } else { +// return "fart"; +// } +// } +// +// echo convert_to_null("why"); + +//convert_to_null#2 +function convert_to_null ($null){ if ($null) { - return $null; - } elseif ($value || $null == 0 || $null == "0" || $null == 0.0 || $null == "null" || is_bool($null)) { + $test = $null; + var_dump($test); + } elseif ($null == null || $null == 0 || $null == "0" || $null == 0.0 || $null == "null") { return null; } else { - return $value2; - var_dump($value2); - } - } + return null; + } +} echo convert_to_null(true); From 0291e328f8476834bb5ae4065f90bc108449f230 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Thu, 26 May 2016 17:44:53 -0400 Subject: [PATCH 24/35] Travis Attempt #14b forgot a small syntax issue in NULL --- src/data_types.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 98c8fe3..92e00aa 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -89,8 +89,7 @@ function convert_to_array($arr){ //convert_to_null#2 function convert_to_null ($null){ if ($null) { - $test = $null; - var_dump($test); + return $null; } elseif ($null == null || $null == 0 || $null == "0" || $null == 0.0 || $null == "null") { return null; } else { From ac5df4a82f27e091a5fa0af80560c8eee9ef9cf2 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Thu, 26 May 2016 18:09:03 -0400 Subject: [PATCH 25/35] Travis Attempt #15 Revamped convert to null and stripped it down. --- 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 92e00aa..4c3a9ff 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -88,13 +88,13 @@ function convert_to_array($arr){ //convert_to_null#2 function convert_to_null ($null){ - if ($null) { - return $null; - } elseif ($null == null || $null == 0 || $null == "0" || $null == 0.0 || $null == "null") { + if ($null == null || $null == 0 || $null == "0" || $null == 0.0 || $null == "null") { return null; + } elseif ($null) { + return $null; } else { return null; } } -echo convert_to_null(true); +echo convert_to_null("null"); From 02ac45cfa6db67dfe93f00d67de7be7e38ec7773 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Thu, 26 May 2016 18:27:43 -0400 Subject: [PATCH 26/35] Travis Attempt #16 Revamped NULL with added if() --- src/data_types.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 4c3a9ff..699ef85 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -88,12 +88,16 @@ function convert_to_array($arr){ //convert_to_null#2 function convert_to_null ($null){ - if ($null == null || $null == 0 || $null == "0" || $null == 0.0 || $null == "null") { + if ($null == "null") { return null; - } elseif ($null) { - return $null; } else { - return null; + if ($null) { + return $null; + } elseif ($null == null || $null == 0 || $null == "0" || $null == 0.0) { + return null; + } else { + return null; + } } } From 4e2b627a73f77f67993476cba6741cf92e6c9085 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Thu, 26 May 2016 18:35:46 -0400 Subject: [PATCH 27/35] Travis Attempt #17 Added boolean condition for if() --- src/data_types.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 699ef85..b30393b 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -88,7 +88,7 @@ function convert_to_array($arr){ //convert_to_null#2 function convert_to_null ($null){ - if ($null == "null") { + if ($null == "null" || is_bool($null)) { return null; } else { if ($null) { @@ -101,4 +101,4 @@ function convert_to_null ($null){ } } -echo convert_to_null("null"); +echo convert_to_null(true); From 07aae064ecd481abf23dc0a6a7c6d87e0a203c8a Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Thu, 26 May 2016 18:43:32 -0400 Subject: [PATCH 28/35] Travis Attempt #18 --- src/data_types.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index b30393b..4ca0cb5 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -88,12 +88,12 @@ function convert_to_array($arr){ //convert_to_null#2 function convert_to_null ($null){ - if ($null == "null" || is_bool($null)) { + if ($null == "null" || $null == null) { return null; } else { if ($null) { return $null; - } elseif ($null == null || $null == 0 || $null == "0" || $null == 0.0) { + } elseif ($null == 0 || $null == "0" || $null == 0.0) { return null; } else { return null; @@ -101,4 +101,4 @@ function convert_to_null ($null){ } } -echo convert_to_null(true); +echo convert_to_null([1,4,8]); From 6ffdccfc969708f2466ef1fdf8281179d5a519e1 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Thu, 26 May 2016 18:49:44 -0400 Subject: [PATCH 29/35] Travis Attempt #19 Removed commented out section and updated NULL. --- src/data_types.php | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 4ca0cb5..2236c8c 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -69,23 +69,6 @@ function convert_to_array($arr){ echo convert_to_array(45); - -//convert_to_null -// function convert_to_null($null){ -// $value= is_null($null); -// // $value2 = is_bool($null); -// var_dump($value); -// if ($value == false) { -// return "begining value"; -// } elseif ($null == 0 || $null == "0" || $null == 0.0 || $null == "null" || is_bool($null)) { -// return "nothing"; -// } else { -// return "fart"; -// } -// } -// -// echo convert_to_null("why"); - //convert_to_null#2 function convert_to_null ($null){ if ($null == "null" || $null == null) { From ea38d6e23b2b818db80ecd3697a0f9c8bce7c5c0 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Thu, 26 May 2016 18:55:48 -0400 Subject: [PATCH 30/35] Travis Attempt #20 NULL should equal try in this. --- src/data_types.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 2236c8c..53fe60a 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -71,10 +71,10 @@ function convert_to_array($arr){ //convert_to_null#2 function convert_to_null ($null){ - if ($null == "null" || $null == null) { + if ($null == "null") { return null; } else { - if ($null) { + if ($null || $null == null) { return $null; } elseif ($null == 0 || $null == "0" || $null == 0.0) { return null; @@ -84,4 +84,4 @@ function convert_to_null ($null){ } } -echo convert_to_null([1,4,8]); +echo convert_to_null(null); From dbbef10d5a6af24a2f1f9b346604198c55cd7f27 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Thu, 26 May 2016 19:04:20 -0400 Subject: [PATCH 31/35] Travis Attempt #21 Switch "" and []. --- src/data_types.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 53fe60a..60574fd 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -71,7 +71,7 @@ function convert_to_array($arr){ //convert_to_null#2 function convert_to_null ($null){ - if ($null == "null") { + if ($null == "null"|| $null == "" || $null == []) { return null; } else { if ($null || $null == null) { @@ -84,4 +84,5 @@ function convert_to_null ($null){ } } -echo convert_to_null(null); +$test = convert_to_null(''); +var_dump($test); From 57d612356bd8a3d38340a3772918deff55aeaa28 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Tue, 31 May 2016 18:11:08 -0400 Subject: [PATCH 32/35] Travis Attempt #22 Getting errors --- src/data_types.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 60574fd..12a35de 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -71,18 +71,19 @@ function convert_to_array($arr){ //convert_to_null#2 function convert_to_null ($null){ - if ($null == "null"|| $null == "" || $null == []) { - return null; + if ($null === "null") { + return "null"; } else { - if ($null || $null == null) { + if ($null || $null === null) { return $null; - } elseif ($null == 0 || $null == "0" || $null == 0.0) { - return null; + } elseif ($null === 0 || $null === "0" || $null === 0.0|| $null === "" || $null === []) { + return "toots"; } else { - return null; + return "farts"; } } } -$test = convert_to_null(''); +$test = convert_to_null(0); var_dump($test); + From 442f50ea130cc7be964340acf13e18edf9e40695 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Tue, 31 May 2016 18:15:44 -0400 Subject: [PATCH 33/35] Travis Attempts #21a changed toots and farts to NULL --- src/data_types.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 12a35de..3edf8fb 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -77,9 +77,9 @@ function convert_to_null ($null){ if ($null || $null === null) { return $null; } elseif ($null === 0 || $null === "0" || $null === 0.0|| $null === "" || $null === []) { - return "toots"; + return null; } else { - return "farts"; + return null; } } From 34e38ea38a77091236db8f3bbd314aadfbf52c90 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Tue, 31 May 2016 18:29:45 -0400 Subject: [PATCH 34/35] Travis Attempt #22 Fixed NULL --- src/data_types.php | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 3edf8fb..bb0d93f 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -69,21 +69,13 @@ function convert_to_array($arr){ echo convert_to_array(45); -//convert_to_null#2 -function convert_to_null ($null){ - if ($null === "null") { - return "null"; +//convert_to_null +function convert_to_null($null){ + if (!$null || $null === "null") { + return null; } else { - if ($null || $null === null) { - return $null; - } elseif ($null === 0 || $null === "0" || $null === 0.0|| $null === "" || $null === []) { - return null; - } else { - return null; - } + return $null; } - } -$test = convert_to_null(0); -var_dump($test); - +$test = convert_to_null("null"); +var_dump($test); \ No newline at end of file From 306d5b8fa170b60447c057f94c5e79f9187b5fd7 Mon Sep 17 00:00:00 2001 From: Pete Isgrigg Date: Tue, 31 May 2016 18:46:29 -0400 Subject: [PATCH 35/35] Travis Attempt #23 Updated convert_to_array --- src/data_types.php | 57 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index bb0d93f..5e61086 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -48,26 +48,55 @@ function convert_to_bool($bool){ echo convert_to_bool(798); +// //convert_to_array +// function convert_to_array($arr){ +// if(is_array($arr)) { +// $test = array_values($arr); +// print_r($test); +// } +// elseif (is_int($arr) || is_string($arr) || is_float($arr) || is_bool($arr)) { +// $convert_arr = array($arr); +// print_r(array_values($convert_arr)); +// } else { +// if (!$arr == null) { +// $empty = []; +// print_r($empty); +// } else +// print_r(null); +// var_dump($empty); +// } +// } + +// echo convert_to_array(45); + + //convert_to_array function convert_to_array($arr){ - if(is_array($arr)) { - $test = array_values($arr); - print_r($test); - } - elseif (is_int($arr) || is_string($arr) || is_float($arr) || is_bool($arr)) { + if (is_array($arr)) { + return $arr; + } elseif (is_int($arr) || is_string($arr) || is_float($arr)) { $convert_arr = array($arr); - print_r(array_values($convert_arr)); + var_dump($convert_arr); + return array_values($convert_arr); } else { - if (!$arr == null) { - $empty = []; - print_r($empty); - } else - print_r(null); - var_dump($empty); - } + $nothing = []; + return $nothing; + } + } -echo convert_to_array(45); +return convert_to_array(null); + + + + + + + + + + + //convert_to_null function convert_to_null($null){