parsecsv/parsecsv-for-php
1
0
Fork 0
mirror of https://github.com/parsecsv/parsecsv-for-php.git synced 2026-02-19 00:36:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

review changes

Browse Source
This commit is contained in:
Susann Sgorzaly
2018-02-14 14:03:00 +01:00
parent 8ec87126dc
commit 5babb55879
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extensions/Datatype.php → extensions/DatatypeTrait.php
View File

@@ -1,6 +1,6 @@
<?php
trait Datatype {
trait DatatypeTrait {
/**
* Datatypes
@@ -53,14 +53,12 @@ trait Datatype {
*
* @access private
*
* @param [array] $datatypes
* @param array $datatypes
*
* @return [string|false]
* @return string|false
*/
private function getMostFrequentDataypeForColumn($datatypes) {
if (isset($datatypes['unknown'])) {
unset($datatypes['unknown']);
}
unset($datatypes['unknown']);
$typesFreq = array_count_values($datatypes);
arsort($typesFreq);
@@ -76,7 +74,7 @@ trait Datatype {
*
* @access public
*
* @return [array|bool]
* @return array|bool
*/
public function getDatatypes() {
if (empty($this->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;
}
}

6
parsecsv.lib.php
View File

@@ -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;