From 9836f43fc7407912490cd006676cf21dbd874cd8 Mon Sep 17 00:00:00 2001 From: Nicholas Dixon Date: Tue, 31 May 2016 22:58:34 +0000 Subject: [PATCH 1/7] PHP data types --- src/data_types.php | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 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..a66bd69 --- /dev/null +++ b/src/data_types.php @@ -0,0 +1,57 @@ + \ No newline at end of file From 84bf4fff3245e1bdee5c8364599724fd3d1e56a3 Mon Sep 17 00:00:00 2001 From: Nicholas Dixon Date: Tue, 31 May 2016 23:08:22 +0000 Subject: [PATCH 2/7] PHP data types take 2 --- src/data_types.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index a66bd69..e6b0409 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -3,55 +3,49 @@ function convert_to_int($input) { if (settype($input, "int")) { return $input; - var_dump($input); } else { return 0; - var_dump($input); + } } function convert_to_float($input) { if (settype($input, "float")) { return $input; - var_dump($input); } else { return 0.0; - var_dump($input); + } } function convert_to_string($input) { if (settype($input, "string")) { return $input; - var_dump($input); } else { return ""; - var_dump($input); + } } function convert_to_bool($input) { if (settype($input, "bool")) { return $input; - var_dump($input); } else { return false; - var_dump($input); + } } function convert_to_array($input) { if (settype($input, "array")) { return $input; - var_dump($input); } else { return []; - var_dump($input); + } } function convert_to_null($input) { if (settype($input, "null")) { return $input; - var_dump($input); } else { return null; - var_dump($input); + } } ?> \ No newline at end of file From d63f09210c756f13e56980e4a3f0df4ae2da72e4 Mon Sep 17 00:00:00 2001 From: Nicholas Dixon Date: Tue, 31 May 2016 23:15:43 +0000 Subject: [PATCH 3/7] PHP data types take 3 --- 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 e6b0409..263beb0 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -20,7 +20,7 @@ function convert_to_string($input) { if (settype($input, "string")) { return $input; } else { - return ""; + return ''; } } @@ -36,15 +36,15 @@ function convert_to_array($input) { if (settype($input, "array")) { return $input; } else { - return []; + return array(); } } function convert_to_null($input) { if (settype($input, "null")) { - return $input; - } else { return null; + } else { + return $input; } } From 9b0ce1e3627eef344cc8c8f378f15c759fb97f8e Mon Sep 17 00:00:00 2001 From: Nicholas Dixon Date: Wed, 1 Jun 2016 01:51:13 +0000 Subject: [PATCH 4/7] Fourth time's a charm --- 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 263beb0..90034eb 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -20,7 +20,7 @@ function convert_to_string($input) { if (settype($input, "string")) { return $input; } else { - return ''; + return ""; } } @@ -36,12 +36,12 @@ function convert_to_array($input) { if (settype($input, "array")) { return $input; } else { - return array(); + return []; } } function convert_to_null($input) { - if (settype($input, "null")) { + if (!$input || $input === 'null') { return null; } else { return $input; From 4f5eecc6d53120253d3cb2cd420a87deaf721256 Mon Sep 17 00:00:00 2001 From: Nicholas Dixon Date: Tue, 14 Jun 2016 23:25:41 +0000 Subject: [PATCH 5/7] Changes to string and array --- src/data_types.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 90034eb..75a2fae 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -17,11 +17,12 @@ function convert_to_float($input) { } function convert_to_string($input) { - if (settype($input, "string")) { + if (is_array($input)) { + return implode(", ", $input); + } elseif (is_string($input)) { return $input; } else { return ""; - } } function convert_to_bool($input) { @@ -36,7 +37,7 @@ function convert_to_array($input) { if (settype($input, "array")) { return $input; } else { - return []; + return array(); } } From ed51df87e28f61a8242bdafcaf9a325a09f915d3 Mon Sep 17 00:00:00 2001 From: Nicholas Dixon Date: Fri, 17 Jun 2016 01:34:44 +0000 Subject: [PATCH 6/7] is_string fixed? --- src/data_types.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 75a2fae..85c3d13 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -19,10 +19,11 @@ function convert_to_float($input) { function convert_to_string($input) { if (is_array($input)) { return implode(", ", $input); - } elseif (is_string($input)) { - return $input; - } else { + } elseif (!is_string($input)) { //do falsy check return ""; + } else { //return string value + return $input; + } } function convert_to_bool($input) { From 963c65cc2871652528f5986f7b4db5e9860fe996 Mon Sep 17 00:00:00 2001 From: Nicholas Dixon Date: Fri, 17 Jun 2016 01:40:58 +0000 Subject: [PATCH 7/7] Another convert_to_string attempt --- 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 85c3d13..09fd03e 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -19,7 +19,7 @@ function convert_to_float($input) { function convert_to_string($input) { if (is_array($input)) { return implode(", ", $input); - } elseif (!is_string($input)) { //do falsy check + } elseif (!settype($input, "string")) { //do falsy check return ""; } else { //return string value return $input;