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

Merge remote-tracking branch 'origin/test-helper-for-itexia-master' into delete_this_branch

Browse Source
This commit is contained in:
Christian Bläul
2018-02-18 19:41:38 +01:00
parent af7368378c d4f9c9f020
commit 2b6e38734c
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/extensions/DatatypeTrait.php
View File

@@ -37,7 +37,7 @@ trait DatatypeTrait {
return 'integer';
}
if (preg_match('/^[+-]?([0-9]*[.])?([0-9]|[.][0-9])+$/', $value)) {
if (preg_match('/(^[+-]?$)|(^[+-]?[0-9]+([,.][0-9])?[0-9]*(e[+-]?[0-9]+)?$)/', $value)) {
return 'float';
}
@@ -75,12 +75,17 @@ trait DatatypeTrait {
*
* @access public
*
* @uses getDatatypeFromString
*
* @return array|bool
*/
public function getDatatypes() {
if (empty($this->data)) {
$this->data = $this->parse_string();
}
if (!is_array($this->data)) {
throw new \Exception('No data set yet.');
}
$result = [];
foreach ($this->titles as $cName) {