From 5babb55879dc0242f79b996b11918b32bb9cf457 Mon Sep 17 00:00:00 2001 From: Susann Sgorzaly Date: Wed, 14 Feb 2018 14:03:00 +0100 Subject: [PATCH] review changes --- extensions/{Datatype.php => DatatypeTrait.php} | 14 ++++++-------- parsecsv.lib.php | 6 +++--- 2 files changed, 9 insertions(+), 11 deletions(-) rename extensions/{Datatype.php => DatatypeTrait.php} (87%) diff --git a/extensions/Datatype.php b/extensions/DatatypeTrait.php similarity index 87% rename from extensions/Datatype.php rename to extensions/DatatypeTrait.php index e7a9f6a..6a242b1 100644 --- a/extensions/Datatype.php +++ b/extensions/DatatypeTrait.php @@ -1,6 +1,6 @@ data)) { @@ -93,6 +91,6 @@ trait Datatype { $this->data_types = $result; - return !empty($this->data_types) ? $this->data_types : FALSE; + return !empty($this->data_types) ? $this->data_types : false; } } diff --git a/parsecsv.lib.php b/parsecsv.lib.php index cee9370..abf343e 100644 --- a/parsecsv.lib.php +++ b/parsecsv.lib.php @@ -322,7 +322,7 @@ class parseCSV { */ public $data = array(); - use Datatype; + use DatatypeTrait; /** * Constructor @@ -469,8 +469,8 @@ class parseCSV { * Encoding * Convert character encoding * - * @param [string] $input Input character encoding, uses default if left blank - * @param [string] $output Output character encoding, uses default if left blank + * @param string $input Input character encoding, uses default if left blank + * @param string $output Output character encoding, uses default if left blank */ public function encoding($input = null, $output = null) { $this->convert_encoding = true;