From 666165645e4bd927785bd3d63dd6387d382d6865 Mon Sep 17 00:00:00 2001 From: John Nall Date: Tue, 31 May 2016 18:21:05 -0400 Subject: [PATCH 01/13] Add files via upload --- src/data_types.php | 59 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 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..e41b6eb --- /dev/null +++ b/src/data_types.php @@ -0,0 +1,59 @@ + 0) { + $conval = intval($input); + } else { + $conval = "0"; +} + return $conval; +} + +function convert_to_float($input = null) { + if($input > 0) { + $conval = floatval($input); + } else { + $conval = "0.0"; +} + return($conval); + } + +function convert_to_string($input = null) { + if(is_array($input)) { + $conval = implode(", ", $input); + } else if($input) { + $conval = strval($input); +} else { + $conval = $input; +} +return($conval); +} + +function convert_to_bool($input = null) { + if($input) { + $conval = boolval($input); + } else { + $conval = false; +} + return($conval); +} + +function convert_to_array($input = array(1,2,3,4)) { + if(is_array($input)) { + $conval = $input; + } else if($conval = null) { + $conval = null; + } + + return($conval); +} + + function convert_to_null($input = null){ + if(is_null($input)) { + $conval = null; + } else { + $conval = $input; + } + retrun($conval); + } +?> From 8e3ac47d41801e287118bdb686786cb1580a7d49 Mon Sep 17 00:00:00 2001 From: John Nall Date: Tue, 31 May 2016 18:31:13 -0400 Subject: [PATCH 02/13] Update data_types.php --- src/data_types.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index e41b6eb..e441c42 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -15,7 +15,7 @@ function convert_to_float($input = null) { } else { $conval = "0.0"; } - return($conval); + return $conval; } function convert_to_string($input = null) { @@ -26,7 +26,7 @@ function convert_to_string($input = null) { } else { $conval = $input; } -return($conval); + return $conval; } function convert_to_bool($input = null) { @@ -35,7 +35,7 @@ function convert_to_bool($input = null) { } else { $conval = false; } - return($conval); + return $conval; } function convert_to_array($input = array(1,2,3,4)) { @@ -45,7 +45,7 @@ function convert_to_array($input = array(1,2,3,4)) { $conval = null; } - return($conval); + return $conval; } function convert_to_null($input = null){ @@ -54,6 +54,6 @@ function convert_to_null($input = null){ } else { $conval = $input; } - retrun($conval); + retrun $conval; } ?> From 69639f1d6949c3f97be1258dbbabe30dff660211 Mon Sep 17 00:00:00 2001 From: John Nall Date: Tue, 31 May 2016 18:48:05 -0400 Subject: [PATCH 03/13] syntax problem --- 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 e441c42..a47ee8e 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -54,6 +54,6 @@ function convert_to_null($input = null){ } else { $conval = $input; } - retrun $conval; + return $conval; } ?> From e5ef570ebf6798ef81f9fa31419e17c296a5e7f0 Mon Sep 17 00:00:00 2001 From: John Nall Date: Tue, 31 May 2016 18:49:25 -0400 Subject: [PATCH 04/13] syntax problem From 85d7bd432a5c709049af3e3063744de1f2f05c6f Mon Sep 17 00:00:00 2001 From: John Nall Date: Tue, 31 May 2016 19:47:28 -0400 Subject: [PATCH 05/13] Update data_types.php --- src/data_types.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index a47ee8e..de89043 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -1,24 +1,24 @@ 0) { $conval = intval($input); } else { - $conval = "0"; + $conval = 0; } return $conval; } -function convert_to_float($input = null) { +function convert_to_float($input) { if($input > 0) { $conval = floatval($input); } else { - $conval = "0.0"; + $conval = 0.0; } return $conval; } -function convert_to_string($input = null) { +function convert_to_string($input) { if(is_array($input)) { $conval = implode(", ", $input); } else if($input) { @@ -29,7 +29,7 @@ function convert_to_string($input = null) { return $conval; } -function convert_to_bool($input = null) { +function convert_to_bool($input) { if($input) { $conval = boolval($input); } else { @@ -38,17 +38,18 @@ function convert_to_bool($input = null) { return $conval; } -function convert_to_array($input = array(1,2,3,4)) { +function convert_to_array($input) { if(is_array($input)) { $conval = $input; } else if($conval = null) { $conval = null; + } else { + $conval = 0; } - return $conval; } - function convert_to_null($input = null){ + function convert_to_null($input){ if(is_null($input)) { $conval = null; } else { From a77e7f90ef901b2a648df24c5817c7b82af627a9 Mon Sep 17 00:00:00 2001 From: John Nall Date: Wed, 1 Jun 2016 11:48:28 -0400 Subject: [PATCH 06/13] Add files via upload --- data_types.php | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 data_types.php diff --git a/data_types.php b/data_types.php new file mode 100644 index 0000000..e08016f --- /dev/null +++ b/data_types.php @@ -0,0 +1,60 @@ + 0) { + $conval = intval($input); + } else { + $conval = 0; +} + return $conval; +} + +function convert_to_float($input) { + if($input > 0) { + $conval = floatval($input); + } else { + $conval = 0.0; +} + return $conval; + } + +function convert_to_string($input) { + if(is_array($input)) { + $conval = implode(", ", $input); + } else if($input) { + $conval = strval($input); +} else { + $conval = $input; +} + return $conval; +} + +function convert_to_bool($input = null) { + if($input) { + $conval = boolval($input); + } else { + $conval = false; +} + return $conval; +} + +function convert_to_array($input) { + if(is_array($input)) { + $conval = $input; + } else if($conval = null) { + $conval = null; + } else { + $conval = 0; + } + return $conval; +} + + function convert_to_null($input){ + if(is_null($input)) { + $conval = null; + } else { + $conval = $input; + } + return $conval; + } + ?> From 9d412bcdb5bc20f3767e9a9a6fbd3d1e60b5a92e Mon Sep 17 00:00:00 2001 From: John Nall Date: Wed, 1 Jun 2016 12:21:50 -0400 Subject: [PATCH 07/13] Add files via upload --- 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 de89043..e08016f 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -29,7 +29,7 @@ function convert_to_string($input) { return $conval; } -function convert_to_bool($input) { +function convert_to_bool($input = null) { if($input) { $conval = boolval($input); } else { @@ -57,4 +57,4 @@ function convert_to_null($input){ } return $conval; } -?> + ?> From b8b8b1cc9cbaef3c1b9ef83a12fa9e6bfb8b93b7 Mon Sep 17 00:00:00 2001 From: John Nall Date: Thu, 2 Jun 2016 12:11:09 -0400 Subject: [PATCH 08/13] Add files via upload --- data_types.php | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/data_types.php b/data_types.php index e08016f..8cc068b 100644 --- a/data_types.php +++ b/data_types.php @@ -18,13 +18,13 @@ function convert_to_float($input) { return $conval; } -function convert_to_string($input) { +function convert_to_string($input = '') { if(is_array($input)) { $conval = implode(", ", $input); } else if($input) { $conval = strval($input); -} else { - $conval = $input; + } else { + $conval = ''; } return $conval; } @@ -38,15 +38,14 @@ function convert_to_bool($input = null) { return $conval; } -function convert_to_array($input) { - if(is_array($input)) { - $conval = $input; - } else if($conval = null) { - $conval = null; +function convert_to_array($input = 0) { + if(!is_array($input)) { + $conval = (array) $input; } else { - $conval = 0; + + $conval = $input; } - return $conval; + return $conval; } function convert_to_null($input){ From c13a44df1b99e68d0017c908db089cb4745dff66 Mon Sep 17 00:00:00 2001 From: John Nall Date: Tue, 14 Jun 2016 18:21:54 -0400 Subject: [PATCH 09/13] Add files via upload --- src/data_types.php | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index e08016f..1ac85af 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -18,17 +18,20 @@ function convert_to_float($input) { return $conval; } -function convert_to_string($input) { +function convert_to_string($input = null) { if(is_array($input)) { $conval = implode(", ", $input); - } else if($input) { + } elseif ($input == null || !$input) { + $conval = null; + } elseif ($input){ $conval = strval($input); -} else { - $conval = $input; + } else { + $conval = ''; } return $conval; } + function convert_to_bool($input = null) { if($input) { $conval = boolval($input); @@ -39,14 +42,13 @@ function convert_to_bool($input = null) { } function convert_to_array($input) { - if(is_array($input)) { - $conval = $input; - } else if($conval = null) { - $conval = null; + if($input === null) { + return []; + } else if(is_array($input)) { + return $input; } else { - $conval = 0; + return [$input]; } - return $conval; } function convert_to_null($input){ From 39a610f672ac0047bafbde3de030d6c71c7ad997 Mon Sep 17 00:00:00 2001 From: John Nall Date: Tue, 14 Jun 2016 18:40:13 -0400 Subject: [PATCH 10/13] Add files via upload --- 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 1ac85af..d41b7db 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -18,10 +18,10 @@ function convert_to_float($input) { return $conval; } -function convert_to_string($input = null) { +function convert_to_string($input) { if(is_array($input)) { $conval = implode(", ", $input); - } elseif ($input == null || !$input) { + } elseif ($input === null || !$input) { $conval = null; } elseif ($input){ $conval = strval($input); @@ -52,7 +52,7 @@ function convert_to_array($input) { } function convert_to_null($input){ - if(is_null($input)) { + if($input === null || !$input) { $conval = null; } else { $conval = $input; From 2a7d0029d11845f567cc7778c7f3434d3081130d Mon Sep 17 00:00:00 2001 From: John Nall Date: Tue, 14 Jun 2016 18:48:27 -0400 Subject: [PATCH 11/13] Add files via upload --- 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 d41b7db..cb7b138 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -21,9 +21,9 @@ function convert_to_float($input) { function convert_to_string($input) { if(is_array($input)) { $conval = implode(", ", $input); - } elseif ($input === null || !$input) { + } else if ($input === null) { $conval = null; - } elseif ($input){ + } else if ($input){ $conval = strval($input); } else { $conval = ''; @@ -52,7 +52,7 @@ function convert_to_array($input) { } function convert_to_null($input){ - if($input === null || !$input) { + if($input === null) { $conval = null; } else { $conval = $input; From abcf1fb671d79832234bc216a3f9a9dea731df0f Mon Sep 17 00:00:00 2001 From: John Nall Date: Tue, 14 Jun 2016 19:42:02 -0400 Subject: [PATCH 12/13] Add files via upload --- src/data_types.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index cb7b138..993b1df 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -21,17 +21,14 @@ function convert_to_float($input) { function convert_to_string($input) { if(is_array($input)) { $conval = implode(", ", $input); - } else if ($input === null) { - $conval = null; - } else if ($input){ - $conval = strval($input); - } else { + } else if (!$input){ $conval = ''; + } else { + $conval = strval($input); } return $conval; } - function convert_to_bool($input = null) { if($input) { $conval = boolval($input); @@ -52,11 +49,10 @@ function convert_to_array($input) { } function convert_to_null($input){ - if($input === null) { - $conval = null; + if(!$input) { + return null; } else { - $conval = $input; + return $input; } - return $conval; - } + ?> From 3227d7c726eeced1cb8e44fd12012272b5b37b12 Mon Sep 17 00:00:00 2001 From: John Nall Date: Tue, 14 Jun 2016 19:47:57 -0400 Subject: [PATCH 13/13] Add files via upload --- 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 993b1df..76bff4b 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -49,10 +49,11 @@ function convert_to_array($input) { } function convert_to_null($input){ - if(!$input) { + if(!$input || $input === 'null') { return null; } else { return $input; } - + } + ?>