From 82b413d7cbb1c1d27850fc5723a099bac6f7eb3c Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 17:58:47 -0400 Subject: [PATCH 01/14] First try...Here's goes nothin'! --- src/data_types.php | 18 ++++++++++++++++++ 1 file changed, 18 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..b5cfde5 --- /dev/null +++ b/src/data_types.php @@ -0,0 +1,18 @@ +$var = "Hello there, everybody!" + +convert_to_int($var) + + +convert_to_float($var) + + +convert_to_string($var) + + +convert_to_bool($var) + + +convert_to_array($var) + + +convert_to_null($var) From f5ea371c04fdd8bbcd4b75908881a4e89095e852 Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 18:02:51 -0400 Subject: [PATCH 02/14] Second try... --- src/data_types.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index b5cfde5..b002888 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -1,18 +1,18 @@ -$var = "Hello there, everybody!" +$var = "Hello there, everybody!"; -convert_to_int($var) +convert_to_int($var); -convert_to_float($var) +convert_to_float($var); -convert_to_string($var) +convert_to_string($var); -convert_to_bool($var) +convert_to_bool($var); -convert_to_array($var) +convert_to_array($var); -convert_to_null($var) +convert_to_null($var); From 09c6c72c3f088ba3190de7c8533a3a96638ce64d Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 18:06:48 -0400 Subject: [PATCH 03/14] Third try...forgot php tags...duh. --- src/data_types.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/data_types.php b/src/data_types.php index b002888..e4b2f85 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -1,3 +1,5 @@ + Date: Tue, 17 May 2016 19:05:11 -0400 Subject: [PATCH 04/14] Fourth try... --- src/data_types.php | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index e4b2f85..03d27f7 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -1,20 +1,26 @@ Date: Tue, 17 May 2016 19:19:21 -0400 Subject: [PATCH 05/14] Fifth try... --- src/data_types.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/data_types.php b/src/data_types.php index 03d27f7..fb0e49c 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -5,22 +5,31 @@ function convert_to_int($input){ return intval($input); } + + function convert_to_float($input){ return floatval($input); } + + function convert_to_string($input){ return strval($input); } + function convert_to_bool($input){ return boolval($input); } + + function convert_to_array($input){ - return array_values($input); + return array($input); } + + function convert_to_null($input){ return $input; } From 8f1e42aa86c3367148132d2c442c4866ef8a4200 Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 19:24:16 -0400 Subject: [PATCH 06/14] Sixth try... --- src/data_types.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index fb0e49c..c44f625 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -23,13 +23,11 @@ function convert_to_bool($input){ } - function convert_to_array($input){ - return array($input); + return array_fill($input); } - function convert_to_null($input){ return $input; } From 4bb4382f9284aae66ddaad137a6de07f19c87c65 Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 19:26:47 -0400 Subject: [PATCH 07/14] 7th try... --- 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 c44f625..22b2423 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -29,5 +29,5 @@ function convert_to_array($input){ function convert_to_null($input){ - return $input; + return is_null($input); } From 80d2c3e579300839bf94c2e890eda127a247a1ef Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 19:33:34 -0400 Subject: [PATCH 08/14] eighth try --- src/data_types.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/data_types.php b/src/data_types.php index 22b2423..6792231 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -29,5 +29,8 @@ function convert_to_array($input){ function convert_to_null($input){ - return is_null($input); + if (!$input) { + return null; + } + return $input; } From 0f69ad6024c88e085cf76d14156ab1a228c66161 Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 19:40:01 -0400 Subject: [PATCH 09/14] changed if statement 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 6792231..2f20ba9 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -24,12 +24,12 @@ function convert_to_bool($input){ function convert_to_array($input){ - return array_fill($input); + return array($input); } function convert_to_null($input){ - if (!$input) { + if (null) { return null; } return $input; From 01b3850ffa2cf1c7c61d87ab461579e87dfc4fb8 Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 19:42:54 -0400 Subject: [PATCH 10/14] changed if back to !$input...not null. --- 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 2f20ba9..f2916e5 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -29,7 +29,7 @@ function convert_to_array($input){ function convert_to_null($input){ - if (null) { + if (!$input){ return null; } return $input; From d1b08b529ccd012d9a32167582a9b8c3274b293c Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 19:52:09 -0400 Subject: [PATCH 11/14] added null to !$input on convert_to_null funciton... --- 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 f2916e5..3a6abb7 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -29,7 +29,7 @@ function convert_to_array($input){ function convert_to_null($input){ - if (!$input){ + if (!$input, null){ return null; } return $input; From 1b8c32683d860f050c6c59d6897f99077f33e16a Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 19:54:33 -0400 Subject: [PATCH 12/14] removed comma on line 32 --- 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 3a6abb7..68d63a9 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -29,7 +29,7 @@ function convert_to_array($input){ function convert_to_null($input){ - if (!$input, null){ + if (!$input null){ return null; } return $input; From 662f983d7a61ea31a8f185219513af1dbdec93b1 Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 19:57:18 -0400 Subject: [PATCH 13/14] Tried an elseif on null --- src/data_types.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/data_types.php b/src/data_types.php index 68d63a9..0d25d2b 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -29,7 +29,9 @@ function convert_to_array($input){ function convert_to_null($input){ - if (!$input null){ + if (!$input){ + return null; + } elseif (null){ return null; } return $input; From 43ca8a94424822c1d10620b5ba42cae66aadad1c Mon Sep 17 00:00:00 2001 From: Matt English Date: Tue, 17 May 2016 19:59:32 -0400 Subject: [PATCH 14/14] added quotes to null --- 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 0d25d2b..5fafaba 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -31,7 +31,7 @@ function convert_to_array($input){ function convert_to_null($input){ if (!$input){ return null; - } elseif (null){ + } elseif ("null"){ return null; } return $input;