From a31cd717164ca93da4614f21caf8080ef7710fc2 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 31 May 2016 19:13:58 -0400 Subject: [PATCH 01/18] test second code test second code --- src/data_types.php | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 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..3c88fed --- /dev/null +++ b/src/data_types.php @@ -0,0 +1,50 @@ + From efd086bdc658c4771b5df730dafe6cad830fd7e4 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 31 May 2016 19:52:24 -0400 Subject: [PATCH 02/18] second test second test --- src/data_types.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 3c88fed..2a605e7 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -1,7 +1,7 @@ From f82fa3b7f9425d302aac7e66a1b194b334680d71 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 31 May 2016 20:06:06 -0400 Subject: [PATCH 03/18] test test --- 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 2a605e7..34c8dd6 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -37,6 +37,8 @@ function convert_to_bool($value) { function convert_to_array($value) { if (!$value) { return []; + } else if (is_array($value)) { + return $value; } else { return [$value]; } @@ -51,5 +53,5 @@ function convert_to_null($value) { } -//var_dump (convert_to_int(4.2), convert_to_float(4.2), convert_to_string([4, 5, 6]), convert_to_bool(4.2), convert_to_array([4.2]), convert_to_null(4.2)); +//var_dump (convert_to_int(4.2), convert_to_float(4.2), convert_to_string([4, 5, 6]), convert_to_bool(4.2), convert_to_array(4.2), convert_to_null(4.2)); ?> From c65f34af3e5c563dff79812c45ed2def0219a113 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 17:08:43 -0400 Subject: [PATCH 04/18] Add files via upload From c610e86ba191c2c1b378f7ed828e1b71efb49682 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 17:12:51 -0400 Subject: [PATCH 05/18] fourth test on second code --- 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 34c8dd6..557180f 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -35,11 +35,11 @@ function convert_to_bool($value) { } function convert_to_array($value) { - if (!$value) { - return []; - } else if (is_array($value)) { + else if (is_array($value)) { return $value; - } else { + } if (!$value) { + return []; + }else { return [$value]; } } From 57c83e0b3836b75625768943a3bb472074c9aff8 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 17:16:22 -0400 Subject: [PATCH 06/18] fifth test of second code --- 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 557180f..606a4ff 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -37,9 +37,9 @@ function convert_to_bool($value) { function convert_to_array($value) { else if (is_array($value)) { return $value; - } if (!$value) { + } else if (!$value) { return []; - }else { + } else { return [$value]; } } From 7939ec00770dc57e7ae06f1203f7a63fcbf43fb8 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 17:20:15 -0400 Subject: [PATCH 07/18] six test of second code --- 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 606a4ff..4a4e587 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -35,7 +35,7 @@ function convert_to_bool($value) { } function convert_to_array($value) { - else if (is_array($value)) { + if (is_array($value)) { return $value; } else if (!$value) { return []; From 98c2a623a11a6cb60c1fdfdda70d2a588ea10c4c Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 17:32:38 -0400 Subject: [PATCH 08/18] seventh attempt second code --- 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 4a4e587..0056a00 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -35,7 +35,7 @@ function convert_to_bool($value) { } function convert_to_array($value) { - if (is_array($value)) { + if (is_array( mixed $value)) { return $value; } else if (!$value) { return []; From 22e7d3feeda93d307da63d37dac14eb21b847968 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 17:37:09 -0400 Subject: [PATCH 09/18] eight attempt second code --- 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 0056a00..7327cfc 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -35,12 +35,12 @@ function convert_to_bool($value) { } function convert_to_array($value) { - if (is_array( mixed $value)) { - return $value; - } else if (!$value) { + if (!$value) { return []; - } else { + } else if { return [$value]; + } else (is_array($value)) { + return $value; } } From 885efa0be017d5b82db58f6396020dfd9a5d7b34 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 17:41:41 -0400 Subject: [PATCH 10/18] number 9 --- 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 7327cfc..34c8dd6 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -37,10 +37,10 @@ function convert_to_bool($value) { function convert_to_array($value) { if (!$value) { return []; - } else if { - return [$value]; - } else (is_array($value)) { + } else if (is_array($value)) { return $value; + } else { + return [$value]; } } From e107235046c8e79409776bca4e3b4d5f8a7276b0 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 18:05:41 -0400 Subject: [PATCH 11/18] tenth 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 34c8dd6..a0afca5 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -35,7 +35,7 @@ function convert_to_bool($value) { } function convert_to_array($value) { - if (!$value) { + if (!$value == 0) { return []; } else if (is_array($value)) { return $value; From 73df52e548d5837629f54ed5ad7e6d6d02b5ef41 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 18:07:42 -0400 Subject: [PATCH 12/18] 11th --- 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 a0afca5..34c8dd6 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -35,7 +35,7 @@ function convert_to_bool($value) { } function convert_to_array($value) { - if (!$value == 0) { + if (!$value) { return []; } else if (is_array($value)) { return $value; From c1d25b932ea31daadd5dc20b619fec29e6119f85 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 18:32:33 -0400 Subject: [PATCH 13/18] 11th test --- data_types.php | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 data_types.php diff --git a/data_types.php b/data_types.php new file mode 100644 index 0000000..6cc6ff5 --- /dev/null +++ b/data_types.php @@ -0,0 +1,65 @@ + From 260f66fd01086402fe5ee8941c7cb78e07a73a6d Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 18:38:14 -0400 Subject: [PATCH 14/18] 13 --- src/data_types.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 34c8dd6..e14fba0 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -34,16 +34,26 @@ function convert_to_bool($value) { } } -function convert_to_array($value) { +//function convert_to_array($value) { +// if (!$value) { +// return []; +// } else if (is_array($value)) { +// return $value; +// } else { +// return [$value]; +// } +//} +//var_dump (convert_to_array('')); + +function convert_to_array ($value) { if (!$value) { return []; - } else if (is_array($value)) { - return $value; - } else { - return [$value]; - } +} else { + return (array)$value; } +//var_dump (convert_to_array('')); + function convert_to_null($value) { if (!$value || $value === "null") { return null; @@ -51,7 +61,5 @@ function convert_to_null($value) { return $value; } } - - //var_dump (convert_to_int(4.2), convert_to_float(4.2), convert_to_string([4, 5, 6]), convert_to_bool(4.2), convert_to_array(4.2), convert_to_null(4.2)); ?> From 56c9bc6c50d3ac50f9eb64816b590b61d0e9028c Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 18:44:05 -0400 Subject: [PATCH 15/18] 14 --- src/data_types.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index e14fba0..4c6da1e 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -45,13 +45,12 @@ function convert_to_bool($value) { //} //var_dump (convert_to_array('')); -function convert_to_array ($value) { +function convert_to_array($value) { if (!$value) { return []; } else { - return (array)$value; + return [$value]; } - //var_dump (convert_to_array('')); function convert_to_null($value) { From 0eebcfda17fbf181a83e40742faa6459f5531ef6 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 18:47:01 -0400 Subject: [PATCH 16/18] 15 --- src/data_types.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/data_types.php b/src/data_types.php index 4c6da1e..2906841 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -51,6 +51,7 @@ function convert_to_array($value) { } else { return [$value]; } +} //var_dump (convert_to_array('')); function convert_to_null($value) { From f149cd58208c5075614a5b950a4cdf6937c4a334 Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 18:52:10 -0400 Subject: [PATCH 17/18] 16 --- 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 2906841..088b899 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -46,13 +46,13 @@ function convert_to_bool($value) { //var_dump (convert_to_array('')); function convert_to_array($value) { - if (!$value) { + if ($value === null) { return []; } else { return [$value]; } } -//var_dump (convert_to_array('')); +//var_dump (convert_to_array([2,3])); function convert_to_null($value) { if (!$value || $value === "null") { From 9401a98e5b84ec24986ab7a388df2954a0ffcf4c Mon Sep 17 00:00:00 2001 From: GregoryC55 Date: Tue, 7 Jun 2016 18:57:24 -0400 Subject: [PATCH 18/18] 17 --- src/data_types.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/data_types.php b/src/data_types.php index 088b899..ecbd61d 100644 --- a/src/data_types.php +++ b/src/data_types.php @@ -34,25 +34,25 @@ function convert_to_bool($value) { } } -//function convert_to_array($value) { -// if (!$value) { -// return []; -// } else if (is_array($value)) { -// return $value; -// } else { -// return [$value]; -// } -//} -//var_dump (convert_to_array('')); - function convert_to_array($value) { if ($value === null) { return []; -} else { - return [$value]; -} + } else if (is_array($value)) { + return $value; + } else { + return [$value]; + } } -//var_dump (convert_to_array([2,3])); +//var_dump (convert_to_array('')); + +//function convert_to_array($value) { +// if ($value === null) { +// return []; +//} else { +// return [$value]; +//} +//} +var_dump (convert_to_array([2,3])); function convert_to_null($value) { if (!$value || $value === "null") {